SOURCES: zaptel-make.patch - 1.2.8

[areq]

Author: areq                         Date: Wed Aug 23 19:23:34 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 1.2.8

---- Files affected:
SOURCES:
   zaptel-make.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/zaptel-make.patch
diff -u SOURCES/zaptel-make.patch:1.6 SOURCES/zaptel-make.patch:1.7
--- SOURCES/zaptel-make.patch:1.6	Sun Aug 20 02:47:41 2006
+++ SOURCES/zaptel-make.patch	Wed Aug 23 21:23:29 2006
@@ -1,17 +1,6 @@
 diff -ur zaptel-1.2.1.org/Makefile zaptel-1.2.1/Makefile
 --- zaptel-1.2.1.org/Makefile	2005-12-04 20:29:27.000000000 +0100
 +++ zaptel-1.2.1/Makefile	2006-01-12 21:50:07.253302750 +0100
-@@ -7,9 +7,8 @@
- 
- 
- HOSTCC=gcc
--ifeq ($(PWD),)
- PWD:=$(shell pwd)
--endif
-+
- # If you want to build for a kernel other than the current kernel, set KVERS
- ifndef KVERS
- KVERS:=$(shell uname -r)
 @@ -24,12 +24,12 @@
  endif
  KINCLUDES:=$(KSRC)/include
@@ -27,24 +16,6 @@
  KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
  	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
  ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
-@@ -111,7 +111,7 @@
- 
- MOD_DESTDIR:=zaptel
- 
--EXTRA_CFLAGS:=-I$(PWD)/include  -I$(PWD)/include/oct6100api
-+EXTRA_CFLAGS:=-I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api
- obj-m:=$(MODULESO)
- wct4xxp-objs:=wct4xxp_base.o vpm450m.o
- 
-@@ -177,7 +177,7 @@
- 	$(CC) $(KFLAGS) -o $@ -c $<
- 
- vpm450m.o: vpm450m.c zaptel.h
--	$(CC) $(KFLAGS) -I$(PWD)/include  -I$(PWD)/include/oct6100api -o $@ -c $<
-+	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
- 
- wct4xxp.o: wct4xxp_base.o vpm450m.o
- 	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
 @@ -322,20 +322,6 @@
  		install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
  	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/zaptel-make.patch?r1=1.6&r2=1.7&f=u