[svn-commits] tzafrir: branch 1.2 r2276 - /branches/1.2/Makefile

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Fri Mar  2 16:29:04 2007
New Revision: 2276

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2276
Log:
Revert the bogus changeset 2274.

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2276&r1=2275&r2=2276
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Mar  2 16:29:04 2007
@@ -113,7 +113,7 @@
 #
 
 KFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS="$(PWD)"
+KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
 KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
 
 CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
@@ -154,7 +154,7 @@
 ifeq ($(BUILDVER),linux26)
 all: prereq $(BINS) $(LIBTONEZONE_SO)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-	$(KMAKE) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
 endif
 
 ifeq ($(HPEC_PRESENT),yes)
@@ -166,7 +166,7 @@
 ZAPTEL_HPEC:=hpec/hpec_x86_64.o_shipped
 endif
 
-KFLAGS+=-DECHO_CAN_HPEC -I"$(PWD)/hpec"
+KFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
 zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
 endif
 
@@ -443,7 +443,7 @@
 	rm -f patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
-	$(KMAKE) clean
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
 	$(MAKE) -C wct4xxp clean
 	$(MAKE) -C wctc4xxp clean
 	rm -rf .tmp_versions