[svn-commits] tzafrir: linux/trunk r8040 - /linux/trunk/Makefile

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Feb 15 03:27:13 CST 2010


Author: tzafrir
Date: Mon Feb 15 03:27:10 2010
New Revision: 8040

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8040
Log:
allow overriding udev rules dir

Later versions of udev prefer installing (packaged) udev rules under
/lib/udev/rules.d . Let's make our path easier to override by packagers.

No functional change.

Modified:
    linux/trunk/Makefile

Modified: linux/trunk/Makefile
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/Makefile?view=diff&rev=8040&r1=8039&r2=8040
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Mon Feb 15 03:27:10 2010
@@ -47,6 +47,8 @@
   HOTPLUG_FIRMWARE:=$(shell if grep -q '^CONFIG_FW_LOADER=[ym]' $(KCONFIG); then echo "yes"; else echo "no"; fi)
 endif
 
+UDEV_DIR:=/etc/udev/rules.d
+
 MODULE_ALIASES:=wcfxs wctdm8xxp wct2xxp
 
 INST_HEADERS:=kernel.h user.h fasthdlc.h wctdm_user.h dahdi_config.h
@@ -135,12 +137,12 @@
 	-rmdir $(DESTDIR)/usr/include/dahdi
 
 install-devices:
-	install -d $(DESTDIR)/etc/udev/rules.d
-	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/dahdi.rules
-	install -m 644 drivers/dahdi/xpp/xpp.rules $(DESTDIR)/etc/udev/rules.d/
+	install -d $(DESTDIR)$(UDEV_DIR)
+	build_tools/genudevrules > $(DESTDIR)$(UDEV_DIR)/dahdi.rules
+	install -m 644 drivers/dahdi/xpp/xpp.rules $(DESTDIR)$(UDEV_DIR)/
 
 uninstall-devices:
-	rm -f $(DESTDIR)/etc/udev/rules.d/dahdi.rules
+	rm -f $(DESTDIR)$(UDEV_DIR)/dahdi.rules
 
 install-modules: modules
 ifndef DESTDIR




More information about the svn-commits mailing list