[svn-commits] tzafrir: tools/trunk r4894 - /linux/trunk/ /linux/trunk/drivers/dahdi/xpp/ /t...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Sep 11 15:52:21 2008
New Revision: 4894

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4894
Log:
Move udev rules xpp.rules from dahdi-tools to dahdi-linux .

Added:
    linux/trunk/drivers/dahdi/xpp/xpp.rules
      - copied unchanged from r4893, tools/trunk/xpp/xpp.rules
Removed:
    tools/trunk/xpp/xpp.rules
Modified:
    linux/trunk/Makefile
    tools/trunk/xpp/Makefile

Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4894&r1=4893&r2=4894
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Thu Sep 11 15:52:21 2008
@@ -170,6 +170,7 @@
 else # DYNFS
 	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/
 endif
 
 uninstall-devices:

Modified: tools/trunk/xpp/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/Makefile?view=diff&rev=4894&r1=4893&r2=4894
==============================================================================
--- tools/trunk/xpp/Makefile (original)
+++ tools/trunk/xpp/Makefile Thu Sep 11 15:52:21 2008
@@ -29,7 +29,6 @@
 DATADIR		= $(datadir)/dahdi
 MANDIR		= $(mandir)/man8
 HOTPLUG_USB_DIR	= /etc/hotplug/usb
-UDEV_RULES_DIR	= /etc/udev/rules.d
 PERLLIBDIR	:= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
 PERL_DIRS	:= $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
 PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
@@ -82,8 +81,6 @@
 	$(INSTALL_DATA) xpp_fxloader.usermap $(DESTDIR)$(HOTPLUG_USB_DIR)/
 	# for backward compatibility and for hotplug users:
 	ln -sf $(DATADIR)/xpp_fxloader $(DESTDIR)$(HOTPLUG_USB_DIR)/
-	$(INSTALL) -d $(DESTDIR)$(UDEV_RULES_DIR)
-	$(INSTALL_DATA) xpp.rules $(DESTDIR)$(UDEV_RULES_DIR)/
 ifneq	(,$(PERLLIBDIR))
 	$(INSTALL) -d $(DESTDIR)$(PERLLIBDIR)
 	for i in $(PERL_DIRS); \