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 c0eec94baf0736ed0926cbaec152674fec4b391c..21e803f48b395777792bb157543de0237095de8c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1481,7 +1481,7 @@ systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
 systemd-detect-virt-install-hook:
        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
 
 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.
 
 # 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:
 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
 
 
        catalog-update-hook