X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=03a65bf08454b91c57bc829568090315249eae7b;hb=8fca4e305f7f10cd739af8851ec341eab654bad0;hp=d8b5b71614aa504e50593d86d3c4c13b3a63af9f;hpb=b20e61f4369b95ea2428ae6f667c40c9f3fc5e68;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d8b5b7161..03a65bf08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2047,6 +2047,20 @@ libsystemd_la_LIBADD = \
 	$(RT_LIBS) \
 	-lresolv
 
+libsystemd-install-hook:
+	libname=libsystemd.so && $(move-to-rootlibdir)
+	-$(MKDIR_P) $(DESTDIR)/var/log/journal
+	-chown 0:0 $(DESTDIR)/var/log/journal
+	-chmod 755 $(DESTDIR)/var/log/journal
+	-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+	-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
+
+libsystemd-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
 pkgconfiglib_DATA += \
 	src/libsystemd/libsystemd.pc
 
@@ -2463,6 +2477,7 @@ dist_udevhwdb_DATA = \
 	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
 	hwdb/20-OUI.hwdb \
+	hwdb/20-net-ifname.hwdb \
 	hwdb/60-keyboard.hwdb
 
 udevconfdir = $(sysconfdir)/udev
@@ -4230,7 +4245,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd.la
+	libsystemd.la \
+	libsystemd-shared.la
 
 _daemon_la_SOURCES = \
 	src/python-systemd/_daemon.c \
@@ -4251,7 +4267,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd.la
+	libsystemd.la \
+	libsystemd-shared.la
 
 _reader_la_SOURCES = \
 	src/python-systemd/_reader.c \
@@ -4340,6 +4357,9 @@ clean-python:
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
 
+EXTRA_DIST += \
+	src/compat-libs/linkwarning.h
+
 define generate-fake-lib
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
@@ -4427,6 +4447,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
+	src/compat-libs/libsystemd-journal.pc \
 	src/compat-libs/libsystemd-login.pc \
 	src/compat-libs/libsystemd-id128.pc \
 	src/compat-libs/libsystemd-daemon.pc
@@ -4448,6 +4469,7 @@ UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
 endif
 
 EXTRA_DIST += \
+	src/compat-libs/libsystemd-journal.pc.in \
 	src/compat-libs/libsystemd-login.pc.in \
 	src/compat-libs/libsystemd-id128.pc.in \
 	src/compat-libs/libsystemd-daemon.pc.in