diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:26:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:26:04 -0400 |
| commit | e6340af0662d276ec53daccfec5fabeea0982169 (patch) | |
| tree | 0fa3d0ef8009428c7fd9f1a742c01269b87d8c30 /src/libsystemd | |
| parent | 801404b19096c117c69c633d46feae35d360d306 (diff) | |
| parent | a83cdb3b2bb21f4e30545ae9ca60f627dfb00c3b (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/compat-libs/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile index 44c4755d36..ff4157fb05 100644 --- a/src/libsystemd/compat-libs/Makefile +++ b/src/libsystemd/compat-libs/Makefile @@ -119,18 +119,18 @@ pkgconfiglib_DATA += \ src/compat-libs/libsystemd-id128.pc \ src/compat-libs/libsystemd-daemon.pc -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +# move lib from $(libdir) to $(libdir) and update devel link, if needed compat-lib-install-hook: - libname=libsystemd-login.so && $(move-to-rootlibdir) - libname=libsystemd-journal.so && $(move-to-rootlibdir) - libname=libsystemd-id128.so && $(move-to-rootlibdir) - libname=libsystemd-daemon.so && $(move-to-rootlibdir) + libname=libsystemd-login.so && $(move-to-libdir) + libname=libsystemd-journal.so && $(move-to-libdir) + libname=libsystemd-id128.so && $(move-to-libdir) + libname=libsystemd-daemon.so && $(move-to-libdir) compat-lib-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-journal.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-id128.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-daemon.so* INSTALL_EXEC_HOOKS += compat-lib-install-hook UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook |