X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7b1bac5e5072e19594cdc57e2cd7c8e67264b6cd;hp=3d3f2652f652c8a3070e188f774800866b160e14;hb=11dac832c75cbdd0015fb0417b9877396ea57f6f;hpb=d51167c6268d11f02c2676693a8e9dc1b628cdbb

diff --git a/Makefile.am b/Makefile.am
index 3d3f2652f..7b1bac5e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,9 +51,9 @@ LIBSYSTEMD_ID128_CURRENT=0
 LIBSYSTEMD_ID128_REVISION=17
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=7
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=7
+LIBSYSTEMD_JOURNAL_CURRENT=8
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=8
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -342,8 +342,6 @@ dist_systemunit_DATA = \
 	units/kexec.target \
 	units/local-fs.target \
 	units/local-fs-pre.target \
-	units/initrd-fs.target \
-	units/initrd-fs-pre.target \
 	units/remote-fs.target \
 	units/remote-fs-pre.target \
 	units/network.target \
@@ -2563,9 +2561,16 @@ libsystemd_journal_internal_la_LIBADD += \
 	$(GCRYPT_LIBS)
 endif
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if
+# needed. Also, grant read access to new journal files to members of
+# "adm" and "wheel".
 libsystemd-journal-install-hook:
 	libname=libsystemd-journal.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-journal-uninstall-hook:
 	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
@@ -3510,7 +3515,7 @@ sphinx-%:
 	$(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
 
 destdir-sphinx: all
-	dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
+	dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
 		$(MAKE) DESTDIR="$$dir" install && \
 	        $(MAKE) DESTDIR="$$dir" sphinx-html && \
 		rm -rf "$$dir"