Permalink
Browse files

autotools: Fix

  • Loading branch information...
1 parent 6f35dac commit 54fc0c0e2b237bd5c5bfd5dfab31588e725fe743 @sardemff7 committed Mar 29, 2012
Showing with 11 additions and 10 deletions.
  1. +10 −10 Makefile.am
  2. +1 −0 configure.ac
View
@@ -72,24 +72,24 @@ uninstall-hook: la-files-uninstall-hook
# *.la files cleanup
la-files-install-hook:
- cd $(DESTDIR)/$(pkglibdir) && \
+ cd $(DESTDIR)$(pkglibdir) && \
rm $(pkglib_LTLIBRARIES)
- cd $(DESTDIR)/$(pluginsdir) && \
+ cd $(DESTDIR)$(pluginsdir) && \
rm $(plugins_LTLIBRARIES)
-# Remove *.so files at uninstall since
+# Remove shared object files at uninstall since
# we remove *.la files at install
la-files-uninstall-hook:
- cd $(DESTDIR)/$(pkglibdir) && \
- rm $(pkglib_LTLIBRARIES:.la=.so)
- cd $(DESTDIR)/$(pluginsdir) && \
- rm $(plugins_LTLIBRARIES:.la=.so)
- rmdir $(DESTDIR)/$(pluginsdir)
- rmdir $(DESTDIR)/$(pkglibdir)
+ cd $(DESTDIR)$(pkglibdir) && \
+ rm $(pkglib_LTLIBRARIES:.la=$(shrext_cmds))
+ cd $(DESTDIR)$(pluginsdir) && \
+ rm $(plugins_LTLIBRARIES:.la=$(shrext_cmds))
+ rmdir $(DESTDIR)$(pluginsdir)
+ rmdir $(DESTDIR)$(pkglibdir)
ifeq ($(dist_pkgdata_DATA),)
install-data-hook: empty-pkgdatadir-install-hook
empty-pkgdatadir-install-hook:
- rmdir $(DESTDIR)/$(pkgdatadir)
+ rmdir $(DESTDIR)$(pkgdatadir)
endif
View
@@ -198,6 +198,7 @@ AC_SUBST(AM_VALA_CFLAGS)
AC_SUBST(AM_VALAFLAGS)
AM_SUBST_NOTMAKE(LIBS)
+AC_SUBST(shrext_cmds)
AC_CONFIG_FILES([
data/libeventd-event.pc

0 comments on commit 54fc0c0

Please sign in to comment.