[Asterisk-cvs] zaptel Makefile,1.71,1.72

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv2448

Modified Files:
	Makefile 
Log Message:
allow modules to be built and _installed_ against any installed kernel (bug #4054)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- Makefile	12 Apr 2005 05:48:08 -0000	1.71
+++ Makefile	20 Apr 2005 14:23:07 -0000	1.72
@@ -72,7 +72,7 @@
 PRIMARY=torisa
 #PRIMARY=wcfxo
 PWD=$(shell pwd)
-KERNEL_SOURCE?=/lib/modules/`uname -r`/build
+KERNEL_SOURCE?=/lib/modules/`uname -r`
 
 all: $(BUILDVER) $(LIBTONEZONE)
 
@@ -81,7 +81,7 @@
 linux26: 
 linux26: prereq $(BINS)
 	@if ! [ -d $(KERNEL_SOURCE) ]; then echo "You do not appear to have the kernel sources for your current kernel installed."; exit 1 ; fi
-	make -C $(KERNEL_SOURCE) SUBDIRS=$(PWD) modules
+	make -C $(KERNEL_SOURCE)/build SUBDIRS=$(PWD) modules
 
 obj-m := $(MODULESO) ztdummy.o
 
@@ -284,20 +284,20 @@
 
 	if [ -f zaptel.ko ]; then \
 		for x in $(MODULESKO) ztdummy.ko; do \
-			install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/$$x ; \
+			install -D -m 644 $$x $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/$$x ; \
 		done; \
 		if ! [ -f wcfxsusb.ko ]; then \
-			rm -f $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/wcfxsusb.ko; \
+			rm -f $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/wcfxsusb.ko; \
 		fi; \
-		rm -f $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/wcfxs.ko; \
+		rm -f $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/wcfxs.ko; \
 	else \
 		for x in $(MODULESO); do \
-			install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/$$x ; \
+			install -D -m 644 $$x $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/$$x ; \
 		done; \
 		if ! [ -f wcfxsusb.o ]; then \
-			rm -f $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/wcfxsusb.o; \
+			rm -f $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/wcfxsusb.o; \
 		fi; \
-		rm -f $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/wcfxs.o; \
+		rm -f $(INSTALL_PREFIX)/$(KERNEL_SOURCE)/misc/wcfxs.o; \
 	fi
 
 	install -D -m 755 $(LIBTONEZONE) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE)