shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

build-sys: fix catalog-update-hook with older systemd

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-11-16 13:53:32 +01:00
parent e2bb347f85
commit f975e76c0b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -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