[zaptel-commits] trunk - r880 in /trunk: ./ Makefile udev/zaptel.rules-combined

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Dec 28 16:11:03 2005
New Revision: 880

URL: http://svn.digium.com/view/zaptel?rev=880&view=rev
Log:
Merged revisions 874,879 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r879 | kpfleming | 2005-12-28 16:10:18 -0600 (Wed, 28 Dec 2005) | 3 lines

support newer udev rules+permissions format
install udev rules by default, since it's so common on distros now

........

Added:
    trunk/udev/zaptel.rules-combined
      - copied unchanged from r879, branches/1.2/udev/zaptel.rules-combined
Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 28 16:11:03 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-865
+/branches/1.2:1-879

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=880&r1=879&r2=880&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Dec 28 16:11:03 2005
@@ -85,9 +85,15 @@
 #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
 DYNFS:=$(shell ps ax | grep -v grep | grep -q devfsd && echo "yes")
 endif
+
 ifeq (${BUILDVER},linux26)
-#Tests for newer linux-2.6 udev support
-DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
+  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
+    DYNFS=yes
+    UDEVRULES=yes
+    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
+      UDEVPERMISSIONS=yes
+    endif
+  endif
 endif
 
 CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
@@ -320,8 +326,16 @@
 		N=$$[$$N+1]; \
 	done
 else # DYNFS
+  ifdef UDEVRULES
+    ifdef UDEVPERMISSIONS
+	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
+	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
+    else # !UDEVPERMISSIONS (newer, combined syntax)
+	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
+    endif
+  else # !UDEVRULES
 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-	@echo "**** If you are running udev, read README.udev"
+  endif
 endif
 
 install: all devices
@@ -398,8 +412,14 @@
 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
 
 install-udev:
+  ifdef UDEVRULES
+    ifdef UDEVPERMISSIONS
 	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
 	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
+    else # !UDEVPERMISSIONS (newer, combined syntax)
+	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
+    endif
+  endif
 
 config:
 	if [ -d $(INSTALL_PREFIX)/etc/rc.d/init.d ]; then \