From e1de236db1de03fbd1384040dfe0ecb0223fc2f0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Aug 2014 19:11:22 +0200 Subject: build: add configure option not to install udev rules Previously, user could only change the udev base directory, but not disabling installation entirely. Support this now with: ./configure --with-udev-dir=no or ./configure --without-udev-dir Also, just passing '--with-udev-dir' equals '--with-udev-dir=yes'. Treat 'yes' equal to the default '/lib/udev'. Also, check that the path is an absolute path starting with a '/'. Signed-off-by: Thomas Haller --- callouts/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'callouts') diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 1e7001c34e..1d1eb3c764 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -69,8 +69,10 @@ libtest_dispatcher_envp_la_LIBADD = \ $(DBUS_LIBS) -udevrulesdir = $(UDEV_BASE_DIR)/rules.d +if WITH_UDEV_DIR +udevrulesdir = $(UDEV_DIR)/rules.d udevrules_DATA = 77-nm-olpc-mesh.rules +endif dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in -- cgit v1.2.3