X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=af44b1390800795a9452d64ce0636b8505cb6733;hb=ddd88763921a1534081ed28e36f6712a85449005;hp=fc59b57c0f52796c7d8a976a08ef04e59eab533a;hpb=1eae4c45c9d04314c927c8ac6323133414020ba3;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fc59b57c0..af44b1390 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,10 +194,11 @@ endif
 
 lib_LTLIBRARIES = \
 	libsystemd-daemon.la \
-        libsystemd-login.la
+	libsystemd-login.la
 
 pkginclude_HEADERS = \
-        src/sd-login.h
+	src/sd-daemon.h \
+	src/sd-login.h
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -209,7 +210,8 @@ noinst_PROGRAMS = \
 	test-cgroup \
 	test-env-replace \
 	test-strv \
-        test-login
+        test-login \
+        test-install
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -425,12 +427,14 @@ EXTRA_DIST = \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
-        units/user@.service.in \
+	units/user@.service.in \
 	systemd.pc.in \
-        libsystemd-daemon.pc.in \
-        libsystemd-login.pc.in \
+	libsystemd-daemon.pc.in \
+	libsystemd-login.pc.in \
+	src/libsystemd-daemon.sym \
+	src/libsystemd-login.sym \
 	introspect.awk \
-        src/73-seat-late.rules.in
+	src/73-seat-late.rules.in
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
@@ -828,6 +832,19 @@ test_login_LDADD = \
 	libsystemd-basic.la \
         libsystemd-login.la
 
+test_install_SOURCES = \
+	src/test-install.c \
+        src/install.c \
+        src/path-lookup.c \
+        src/unit-name.c
+
+test_install_CFLAGS = \
+	$(AM_CFLAGS) \
+        $(DBUS_CFLAGS)
+
+test_install_LDADD = \
+	libsystemd-basic.la
+
 systemd_logger_SOURCES = \
 	src/logger.c \
 	src/tcpwrap.c
@@ -1380,6 +1397,19 @@ libsystemd_daemon_la_LDFLAGS = \
         -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
         -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-daemon-install-hook:
+	if test "$(libdir)" != "$(rootlibdir)"; then \
+		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+		mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+	fi
+
+libsystemd-daemon-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+
 libsystemd_login_la_SOURCES = \
         src/sd-login.c \
         src/cgroup-util.c
@@ -1808,6 +1838,10 @@ if HAVE_SYSV_COMPAT
 		$(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
+install-exec-hook: libsystemd-daemon-install-hook
+
+uninstall-hook: libsystemd-daemon-uninstall-hook
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \