chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rpm: update RPM macros to include definitions for more drop-in directories and for...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index c0eec94baf0736ed0926cbaec152674fec4b391c..7860174e52d6de8d02ce33430dfe9116275cee03 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
@@
-1955,6
+1955,14
@@
udevadm_LDADD = \
libudev-core.la \
libsystemd-shared.la
libudev-core.la \
libsystemd-shared.la
+# Update hwdb on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+hwdb-update-hook:
+ -test -n "$(DESTDIR)" || udevadm hwdb --update
+
+INSTALL_DATA_HOOKS += \
+ hwdb-update-hook
+
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
@@
-2714,18
+2722,14
@@
libsystemd-journal-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
-# Update catalog on installation
/ deinstallation
. Do not bother if installing
+# Update catalog on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
catalog-update-hook:
# in DESTDIR, since this is likely for packaging purposes.
catalog-update-hook:
- test -n "$(DESTDIR)" || journalctl --update-catalog
-
-INSTALL_EXEC_HOOKS += \
- catalog-update-hook
+ -test -n "$(DESTDIR)" || journalctl --update-catalog
-
UNINSTALL_EXEC
_HOOKS += \
+
INSTALL_DATA
_HOOKS += \
catalog-update-hook
catalog-update-hook
-
noinst_PROGRAMS += \
test-journal \
test-journal-send \
noinst_PROGRAMS += \
test-journal \
test-journal-send \
@@
-3746,6
+3750,11
@@
SED_PROCESS = \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
+ -e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
+ -e 's,@udevrulesdir\@,$(udevrulesdir),g' \
+ -e 's,@catalogdir\@,$(catalogdir),g' \
+ -e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
+ -e 's,@sysctldir\@,$(sysctldir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \