X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=21e803f48b395777792bb157543de0237095de8c;hp=43db5a529ef828f3bad24755613d0c926f883fd5;hb=f975e76c0b6b93a10ecff1a07c577a10d1cf23cd;hpb=f553b3b1074151200187df916427a1468186435e

diff --git a/Makefile.am b/Makefile.am
index 43db5a529..21e803f48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1481,7 +1481,7 @@ systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 
 systemd-detect-virt-install-hook:
-	$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+	-$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
 
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
@@ -2714,6 +2714,17 @@ libsystemd-journal-uninstall-hook:
 UNINSTALL_EXEC_HOOKS += \
 	libsystemd-journal-uninstall-hook
 
+# Update catalog on installation / deinstallation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+# Ignore failure, since there are other reasons why it might not work,
+# like running under distcheck.
+catalog-update-hook:
+	-test -n "$(DESTDIR)" || journalctl --update-catalog
+
+INSTALL_DATA_HOOKS += \
+	catalog-update-hook
+
+
 noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send \