summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-12-28 22:11:03 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-12-28 22:11:03 +0000
commitbd514343a8d9d0f07c863968472570f0e411febc (patch)
tree566636503fa7c501281a8b57f2583c3a86611abc /Makefile
parent9762f08c3e05e28570a32b94f6004136f464d22f (diff)
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 ........ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@880 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 23 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e1d25a4..a240c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -85,9 +85,15 @@ ifeq (${BUILDVER},linux24)
#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 @@ ifndef DYNFS
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 @@ install: all devices
[ -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 \