From: Zbigniew Jędrzejewski-Szmek Date: Fri, 16 Nov 2012 12:53:32 +0000 (+0100) Subject: build-sys: fix catalog-update-hook with older systemd X-Git-Tag: v196~49 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f975e76c0b6b93a10ecff1a07c577a10d1cf23cd;ds=sidebyside build-sys: fix catalog-update-hook with older systemd The hook would fail if preexisting journalctl doesn't support --update-catalog. Also, the catalog would be updated before new catalog files were installed. Both issues are fixed by moving to INSTALL_DATA_HOOK instead of INSTALL_EXEC_HOOK, since the hook is now executed after both journalctl and catalog files are installed. --- diff --git a/Makefile.am b/Makefile.am index c0eec94ba..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 @@ -2716,13 +2716,12 @@ UNINSTALL_EXEC_HOOKS += \ # 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 + -test -n "$(DESTDIR)" || journalctl --update-catalog -INSTALL_EXEC_HOOKS += \ - catalog-update-hook - -UNINSTALL_EXEC_HOOKS += \ +INSTALL_DATA_HOOKS += \ catalog-update-hook