Index: zaptel/Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- zaptel/Makefile	15 Aug 2003 13:16:50 -0000	1.12
+++ zaptel/Makefile	25 Sep 2003 19:11:37 -0000
@@ -12,14 +12,16 @@
 # to their working kernel source directory, the way God himself does, of course
 # (assuming He's running Linux -- which we all know He must).
 #
-KINCLUDES=$(shell if [ -d /usr/src/linux-2.4/include ]; then echo /usr/src/linux-2.4/include ; else echo /usr/src/linux/include ; fi)
+#KBASE=../linux-2.4.22
+KBASE=$(shell if [ -d /usr/src/linux-2.4/include ]; then echo /usr/src/linux-2.4 ; else echo /usr/src/linux ; fi)
+KINCLUDES=$(KBASE)/include
 
 CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
-KFLAGS+=-I/usr/src/linux-2.4/include -O6
-KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I/usr/src/linux/drivers/net \
-	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I/usr/src/linux/drivers/net/wan -I /usr/src/linux/include -I/usr/src/linux/include/net
+KFLAGS+=-I$(KINCLUDES) -O6
+KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KBASE)/drivers/net \
+	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KBASE)/drivers/net/wan -I$(KBASE)/include -I$(KBASE)/include/net
 KFLAGS+=$(shell [ -f $(KINCLUDES)/linux/modversions.h ] && echo "-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h")
 KFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-msoft-float -fsigned-char"; fi)
 #
@@ -58,7 +60,7 @@
 #
 # Uncomment for Generic PPP support (i.e. ZapRAS)
 #
-KFLAGS+=-DCONFIG_ZAPATA_PPP
+#KFLAGS+=-DCONFIG_ZAPATA_PPP
 #
 # Uncomment to enable "watchdog" to monitor if interfaces
 # stop taking interrupts or otherwise misbehave