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:
b02140b
)
Change hook handling to be more portable.
author
Diego Elio 'Flameeyes' Pettenò
<flameeyes@gmail.com>
Fri, 7 Aug 2009 00:52:49 +0000
(
02:52
+0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 7 Aug 2009 17:15:29 +0000
(19:15 +0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 0aa8c071adbb2c5e84ddff093606af78e3657cf2..5807cbbeb538b458ecf4406677086ab1eef9823a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-58,6
+58,9
@@
doc-sync:
rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/
rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/
rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/
rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/
+INSTALL_EXEC_HOOKS = libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
+
include_HEADERS = libudev/libudev.h
# ------------------------------------------------------------------------------
include_HEADERS = libudev/libudev.h
# ------------------------------------------------------------------------------
@@
-267,6
+270,8
@@
libudev_libudev_private_la_LIBADD += \
endif
if ENABLE_EXTRAS
endif
if ENABLE_EXTRAS
+INSTALL_EXEC_HOOKS += udevacl-install-hook
+
dist_udevrules_DATA += \
rules/rules.d/75-net-description.rules \
rules/rules.d/75-tty-description.rules \
dist_udevrules_DATA += \
rules/rules.d/75-net-description.rules \
rules/rules.d/75-tty-description.rules \
@@
-282,7
+287,6
@@
libexec_PROGRAMS += \
extras/usb-db/pci-db \
extras/modem-modeswitch/modem-modeswitch
extras/usb-db/pci-db \
extras/modem-modeswitch/modem-modeswitch
-install-exec-hook: udevacl-install-hook
SUBDIRS += \
extras/keymap \
SUBDIRS += \
extras/keymap \
@@
-318,9
+322,9
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
# Install and uninstall hooks
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
# Install and uninstall hooks
# ------------------------------------------------------------------------------
-install-exec-hook:
libudev-install-move-hook
+install-exec-hook:
$(INSTALL_EXEC_HOOKS)
-uninstall-hook:
libudev-uninstall-move-hook
+uninstall-hook:
$(UNINSTALL_EXEC_HOOKS)
# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
libudev-install-move-hook:
# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
libudev-install-move-hook: