ensure that PWD is set early enough for 'make install' to actually work

use proper KERNEL matching syntax for udev rules
don't install udev rules as mode 0444; there is no need to make them read-only


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1060 5390a7c7-147a-4af0-8ec9-7488f05a26cb

3 files changed, 17 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 82b835d..a76df9f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
 #
 #
 BASEADDR=0xd0000
+PWD:=$(shell pwd)
 
 HOSTCC=gcc
 # If you want to build for a kernel other than the current kernel, set KVERS
@@ -167,7 +168,6 @@ BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
 #PRIMARY=wcfxo
-PWD:=$(shell pwd)
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
@@ -338,10 +338,10 @@ ifndef DYNFS
 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
+	install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
+	install -m 666 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
+	install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
     endif
   else # !UDEVRULES
 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
@@ -433,10 +433,10 @@ install: all devices
 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
+	install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
+	install -m 666 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
+	install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
     endif
   endif
 
diff --git a/udev/zaptel.rules b/udev/zaptel.rules
index e391fb4..9ad7f73 100644
--- a/udev/zaptel.rules
+++ b/udev/zaptel.rules
@@ -1,6 +1,6 @@
 # zaptel devices
-KERNEL="zapctl",     NAME="zap/ctl"
-KERNEL="zaptimer",   NAME="zap/timer"
-KERNEL="zapchannel", NAME="zap/channel"
-KERNEL="zappseudo",  NAME="zap/pseudo"
-KERNEL="zap[0-9]*",  NAME="zap/%n"
+KERNEL=="zapctl",     NAME="zap/ctl"
+KERNEL=="zaptimer",   NAME="zap/timer"
+KERNEL=="zapchannel", NAME="zap/channel"
+KERNEL=="zappseudo",  NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",  NAME="zap/%n"
diff --git a/udev/zaptel.rules-combined b/udev/zaptel.rules-combined
index 545e94f..91719fc 100644
--- a/udev/zaptel.rules-combined
+++ b/udev/zaptel.rules-combined
@@ -1,6 +1,6 @@
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"