[svn-commits] twilson: branch 1.4 r4213 - /branches/1.4/Makefile

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu May  1 11:46:44 2008
New Revision: 4213

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4213
Log:
Allow $(ARCH) to be overridden and pass on through $(KMAKE)

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=4213&r1=4212&r2=4213
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu May  1 11:46:44 2008
@@ -18,7 +18,9 @@
 PWD:=$(shell pwd)
 endif
 
+ifeq ($(ARCH),)
 ARCH:=$(shell uname -m | sed -e s/i.86/i386/)
+endif
 
 ifeq ($(DEB_HOST_GNU_TYPE),)
 UNAME_M:=$(shell uname -m)
@@ -190,7 +192,7 @@
   UNAME_M=$(UNAME_M) \
   BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
 else
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
+KMAKE  = $(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/kernel \
   HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)"
 endif
 KMAKE_INST = $(KMAKE) \