shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

build-sys: get rid of move-to-rootlibdir

Browse Source 
Replace move-to-rootlibdir calls in post-install hooks with explicitly
used ${rootlibdir} where needed.

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
This commit is contained in:
Maciek Borzecki 2016-09-24 14:17:30 +02:00
parent af0a10bfa1
commit 082210c7a8
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile.am
View File

@ -251,16 +251,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
AM_LDFLAGS = $(OUR_LDFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
rm -f $(DESTDIR)$(libdir)/$$libname && \
$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
INSTALL_DIRS = INSTALL_DIRS =
SHUTDOWN_TARGET_WANTS = SHUTDOWN_TARGET_WANTS =
@ -3284,15 +3274,6 @@ libsystemd_la_LIBADD = \
libbasic.la \ libbasic.la \
libsystemd-journal-internal.la libsystemd-journal-internal.la
libsystemd-install-hook:
libname=libsystemd.so && $(move-to-rootlibdir)
libsystemd-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
INSTALL_EXEC_HOOKS += libsystemd-install-hook
UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
pkgconfiglib_DATA += \ pkgconfiglib_DATA += \
src/libsystemd/libsystemd.pc src/libsystemd/libsystemd.pc
@ -3305,7 +3286,7 @@ pkginclude_HEADERS += \
src/systemd/sd-id128.h \ src/systemd/sd-id128.h \
src/systemd/sd-daemon.h src/systemd/sd-daemon.h
lib_LTLIBRARIES += \ rootlib_LTLIBRARIES += \
libsystemd.la libsystemd.la
tests += \ tests += \
@ -3637,7 +3618,7 @@ tests += \
include_HEADERS += \ include_HEADERS += \
src/libudev/libudev.h src/libudev/libudev.h
lib_LTLIBRARIES += \ rootlib_LTLIBRARIES += \
libudev.la libudev.la
libudev_la_SOURCES =\ libudev_la_SOURCES =\
@ -3669,16 +3650,6 @@ pkgconfiglib_DATA += \
EXTRA_DIST += \ EXTRA_DIST += \
src/libudev/libudev.pc.in src/libudev/libudev.pc.in
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-hook:
libname=libudev.so && $(move-to-rootlibdir)
libudev-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
INSTALL_EXEC_HOOKS += libudev-install-hook
UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \ noinst_LTLIBRARIES += \
libudev-internal.la libudev-internal.la