[svn-commits] trunk - r898 /trunk/Makefile

[svn-commits at lists.digium.com]

Author: mattf
Date: Thu Jan 12 17:14:22 2006
New Revision: 898

URL: http://svn.digium.com/view/zaptel?rev=898&view=rev
Log:
Simplify logic for DYNFS checks

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=898&r1=897&r2=898&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jan 12 17:14:22 2006
@@ -97,18 +97,17 @@
   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