summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-01-12 23:14:22 +0000
committermattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-01-12 23:14:22 +0000
commite885d888d0b9ae9756920fc6faa0568518d9f4eb (patch)
tree8c99547c3d74ea58ff1e6ce780e23831b10c24ce /Makefile
parent254ac835731f0332304432d08585e70cfeb55f58 (diff)
Simplify logic for DYNFS checks
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@898 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 11 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 484bbea..deb4114 100644
--- a/Makefile
+++ b/Makefile
@@ -97,18 +97,17 @@ else # BUILDVER == linux24
endif
endif
-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)
- ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
- DYNFS=yes
- UDEVRULES=yes
- ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
- UDEVPERMISSIONS=yes
- endif
+# This is not related to the version that we build. Rather, to the
+# version that we runs. If we build for 2.4 using 2.4 headers on a 2.6
+# system with udev mounted on /dev , no point in installing files to /dev
+# because they'll be wiped at next reboot.
+DYNFS=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes")
+
+# Check for udev permissions directories
+ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
+ UDEVRULES=yes
+ ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
+ UDEVPERMISSIONS=yes
endif
endif