chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4641b09
)
build-sys: udev - create hwdb with make install
author
Kay Sievers
<kay@vrfy.org>
Fri, 16 Nov 2012 16:58:31 +0000
(17:58 +0100)
committer
Kay Sievers
<kay@vrfy.org>
Fri, 16 Nov 2012 16:58:31 +0000
(17:58 +0100)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 21e803f48b395777792bb157543de0237095de8c..403b46b7210fe7a3c4620dedcf090421959bb74e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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,17
+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.
# 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
catalog-update-hook:
-test -n "$(DESTDIR)" || journalctl --update-catalog
INSTALL_DATA_HOOKS += \
catalog-update-hook
-
noinst_PROGRAMS += \
test-journal \
test-journal-send \
noinst_PROGRAMS += \
test-journal \
test-journal-send \