From d17cc116cd49cbff2659bbd631f56eec4ae5bffd Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Fri, 12 Jun 2009 22:30:02 +0000 Subject: Make complex conditionals work with GNU make 3.80. Much uglier, but it works on RHEL4. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6688 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/Kbuild | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 1c2d1e3..b8719ec 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -71,16 +71,20 @@ dahdi-objs := dahdi-base.o 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 - DAHDI_ARCH=x86_64 - endif else + ifeq ($(ARCH),x86_64) + DAHDI_ARCH=x86_64 + else + 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 endif ############################################################################### -- cgit v1.2.3