[systemd-commits] Makefile.am

[Kay Sievers]

 Makefile.am |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit c4eb3681c77329cb1ff9114e7f7274818c02da18
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Nov 16 17:58:31 2012 +0100

    build-sys: udev - create hwdb with make install

diff --git a/Makefile.am b/Makefile.am
index 21e803f..403b46b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1955,6 +1955,14 @@ udevadm_LDADD = \
 	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 \
@@ -2714,17 +2722,14 @@ 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.
-# 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
 
-
 noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send \