diff -uarN bcm5700-8.3.14/src/Makefile bcm5700-source-8.3.14/src/Makefile --- bcm5700-8.3.14/src/Makefile 2005-11-03 01:08:15.000000000 +0100 +++ bcm5700-source-8.3.14/src/Makefile 2007-03-30 15:32:38.000000000 +0200 @@ -4,30 +4,24 @@ # PREFIX may be set by the RPM build to set the effective root. PREFIX= -ifeq ($(shell ls /lib/modules/$(shell uname -r)/build > /dev/null 2>&1 && echo build),) +ifeq ($(shell ls /lib/modules/$(KVER)/build > /dev/null 2>&1 && echo build),) ifeq ($(shell ls /usr/src/linux > /dev/null 2>&1 && echo linux),) - LINUX= + KSRC= else - LINUX=/usr/src/linux + KSRC=/usr/src/linux endif else - LINUX=/lib/modules/$(shell uname -r)/build - ifeq ($(shell ls /lib/modules/$(shell uname -r)/source > /dev/null 2>&1 && echo source),) - LINUXSRC=$(LINUX) - else - LINUXSRC=/lib/modules/$(shell uname -r)/source - endif - + KSRC=/lib/modules/$(KVER)/build endif -ifneq ($(shell grep netdump_mode $(LINUXSRC)/include/linux/kernel.h > /dev/null 2>&1 && echo rh),) +ifneq ($(shell grep netdump_mode $(KSRC)/include/linux/kernel.h > /dev/null 2>&1 && echo rh),) NETDUMP_CFLAG = -DRED_HAT_LINUX_KERNEL else NETDUMP_CFLAG = endif # check if 2.4 kernel or 2.5+ kernel -BCM_KVER:=$(shell uname -r | cut -c1-3 | sed 's/2\.[56]/2\.6/') +BCM_KVER:=$(shell echo $(KVER) | cut -c1-3 | sed 's/2\.[56]/2\.6/') ifeq ($(BCM_KVER), 2.6) # Makefile for 2.5+ kernel @@ -45,7 +39,7 @@ else default: - make -C $(LINUX) SUBDIRS=$(shell pwd) modules + make -C $(KSRC) SUBDIRS=$(shell pwd) modules endif @@ -54,7 +48,7 @@ BCM_DRV = bcm5700.o -ifeq ($(LINUX),) +ifeq ($(KSRC),) $(error Linux kernel source tree not found) endif @@ -69,7 +63,7 @@ endif LD = ld -CFLAGS=-DMODULE -D__KERNEL__ -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT -DINCLUDE_5701_AX_FIX=1 $(NETDUMP_CFLAG) -Wall -Wstrict-prototypes -I$(LINUX)/include +CFLAGS=-DMODULE -D__KERNEL__ -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT -DINCLUDE_5701_AX_FIX=1 $(NETDUMP_CFLAG) -Wall -Wstrict-prototypes -I$(KSRC)/include ifeq ($(wildcard ~/rpmdir),) rpmdir = /usr/src/redhat @@ -129,18 +123,18 @@ else install: $(BCM_DRV) bcm5700.4.gz endif - @if [ -d $(PREFIX)/lib/modules/$(shell uname -r)/kernel/3rdparty/bcm5700 ];\ - then rm -f $(PREFIX)/lib/modules/$(shell uname -r)/kernel/3rdparty/bcm5700/$(BCM_DRV).gz;\ - install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(shell uname -r)/kernel/3rdparty/bcm5700;\ - elif [ -d $(PREFIX)/lib/modules/$(shell uname -r)/kernel/drivers/addon/bcm5700 ];\ - then install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(shell uname -r)/kernel/drivers/addon/bcm5700;\ - elif [ -d $(PREFIX)/lib/modules/$(shell uname -r)/kernel/drivers/net/bcm ];\ - then install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(shell uname -r)/kernel/drivers/net/bcm;\ - elif [ -d $(PREFIX)/lib/modules/$(shell uname -r)/kernel ];\ - then mkdir -p $(PREFIX)/lib/modules/$(shell uname -r)/kernel/drivers/net;\ + @if [ -d $(PREFIX)/lib/modules/$(KVER)/kernel/3rdparty/bcm5700 ];\ + then rm -f $(PREFIX)/lib/modules/$(KVER)/kernel/3rdparty/bcm5700/$(BCM_DRV).gz;\ + install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(KVER)/kernel/3rdparty/bcm5700;\ + elif [ -d $(PREFIX)/lib/modules/$(KVER)/kernel/drivers/addon/bcm5700 ];\ + then install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(KVER)/kernel/drivers/addon/bcm5700;\ + elif [ -d $(PREFIX)/lib/modules/$(KVER)/kernel/drivers/net/bcm ];\ + then install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(KVER)/kernel/drivers/net/bcm;\ + elif [ -d $(PREFIX)/lib/modules/$(KVER)/kernel ];\ + then mkdir -p $(PREFIX)/lib/modules/$(KVER)/kernel/drivers/net;\ install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/`uname -r`/kernel/drivers/net;\ - else mkdir -p $(PREFIX)/lib/modules/$(shell uname -r)/net;\ - install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(shell uname -r)/net/;\ + else mkdir -p $(PREFIX)/lib/modules/$(KVER)/net;\ + install -m 444 $(BCM_DRV) $(PREFIX)/lib/modules/$(KVER)/net/;\ fi @if [ "$(PREFIX)" = "" ]; then /sbin/depmod -a ;\ else echo " *** Run '/sbin/depmod -a' to update the module database.";\