[svn-commits] qwell: linux/trunk r6688 - /linux/trunk/drivers/dahdi/Kbuild

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Jun 12 17:30:02 2009
New Revision: 6688

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6688
Log:
Make complex conditionals work with GNU make 3.80.  Much uglier, but it works on RHEL4.

Modified:
    linux/trunk/drivers/dahdi/Kbuild

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=6688&r1=6687&r2=6688
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Fri Jun 12 17:30:02 2009
@@ -71,16 +71,20 @@
 
 ifeq ($(ARCH),i386)
   DAHDI_ARCH=x86_32
-else ifeq ($(ARCH),x86_64)
-  DAHDI_ARCH=x86_64
-else ifeq ($(ARCH),x86)
-  ifeq ($(CONFIG_X86_32),y)
-    DAHDI_ARCH=x86_32
+else
+  ifeq ($(ARCH),x86_64)
+    DAHDI_ARCH=x86_64
   else
-    DAHDI_ARCH=x86_64
+    ifeq ($(ARCH),x86)
+      ifeq ($(CONFIG_X86_32),y)
+        DAHDI_ARCH=x86_32
+      else
+        DAHDI_ARCH=x86_64
+      endif
+    else
+$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 or HPEC. Skipping.)
+    endif
   endif
-else
-$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 or HPEC. Skipping.)
 endif
 
 ###############################################################################