X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3f6493773207d01da664b4dbd928db3a92a580a5;hb=6aa8d43ade72e24c9426e604f7fc4b7582b9db7c;hp=6e12a43ddf618545b1a821c4c8e8f37f41c72b36;hpb=d611dadcc74db10ba533ee6859308f5fc505aee1;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 6e12a43dd..3f6493773 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@
@@ -64,7 +64,7 @@ pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=$(datadir)/bash-completion/completions
+bashcompletiondir=@bashcompletiondir@
 rpmmacrosdir=$(sysconfdir)/rpm
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@ -318,7 +318,6 @@ systemd_analyze_LDADD = \
 dist_bashcompletion_DATA = \
 	shell-completion/bash/journalctl \
 	shell-completion/bash/systemctl \
-	shell-completion/bash/systemd-coredumpctl \
 	shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
@@ -523,7 +522,7 @@ CLEANFILES += \
        man/index.html
 
 man/index.html:
-	$(AM_V_GEN)$(LN_S) systemd.index.html $@
+	$(AM_V_GEN)$(LN_S) -f systemd.index.html $@
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 
@@ -843,6 +842,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/selinux-access.h \
 	src/core/selinux-setup.c \
 	src/core/selinux-setup.h \
+	src/core/smack-setup.c \
+	src/core/smack-setup.h \
 	src/core/ima-setup.c \
 	src/core/ima-setup.h \
 	src/core/locale-setup.h \
@@ -2374,13 +2375,6 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif
 
-systemd_coredumpctl_SOURCES = \
-	src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-journal.la
-
 test_journal_SOURCES = \
 	src/journal/test-journal.c
 
@@ -2569,9 +2563,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*
@@ -2625,7 +2626,6 @@ rootbin_PROGRAMS += \
 	journalctl
 
 bin_PROGRAMS += \
-	systemd-coredumpctl \
 	systemd-cat
 
 dist_systemunit_DATA += \
@@ -2717,6 +2717,19 @@ endif
 rootlibexec_PROGRAMS += \
 	systemd-coredump
 
+systemd_coredumpctl_SOURCES = \
+	src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal.la
+
+bin_PROGRAMS += \
+	systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+	shell-completion/bash/systemd-coredumpctl
+
 sysctl_DATA = \
 	sysctl.d/coredump.conf
 
@@ -3504,7 +3517,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"
@@ -3797,6 +3810,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
+	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr