diff -urN driverloader-2.48/modules/Makefile driverloader-2.48-debian_tree/modules/Makefile --- driverloader-2.48/modules/Makefile 2009-04-23 10:50:30.000000000 -0400 +++ driverloader-2.48-debian_tree/modules/Makefile 2009-05-05 16:38:55.000000000 -0400 @@ -63,11 +63,11 @@ #CC= gcc CC := $(shell $(TOP)/modules/kernelcompiler.sh $(KERNELVER) $(DLDR_KERNELSRC)) -# On SuSE 9.0 and up, DLDR_KERNELSRC points to an incomplete kernel source +# On SuSE 9.0 and up as well as Debian 2.6.29-1-* kernels and up, DLDR_KERNELSRC points to an incomplete kernel source # directory and some include files are not available in this tree -SUSE_OBJ_TREE := $(shell if grep -q '^\(KERNELSRC\)\|\(MAKEARGS\) ' "${DLDR_KERNELSRC}/Makefile" 2>/dev/null && [ -d "${DLDR_KERNELSRC}" ]; then echo "yes"; else echo "no"; fi) +DIFF_OBJ_TREE := $(shell if grep -q '^\(KERNELSRC\)\|\(MAKEARGS\) ' "${DLDR_KERNELSRC}/Makefile" 2>/dev/null && [ -d "${DLDR_KERNELSRC}" ]; then echo "yes"; else echo "no"; fi) -ifeq ($(SUSE_OBJ_TREE),yes) +ifeq ($(DIFF_OBJ_TREE),yes) REAL_KERNELSRC := $(shell awk '{ if ($$1 == "MAKEARGS" && $$3 == "-C") print $$4; if ($$1 == "KERNELSRC") print $$3; }' "${DLDR_KERNELSRC}/Makefile") # Deal with a relative path REAL_KERNELSRC := $(if $(filter ../%, $(REAL_KERNELSRC)), $(DLDR_KERNELSRC)/,)$(REAL_KERNELSRC) @@ -79,7 +79,7 @@ # On some newer SuSE kernels, the include directory doesn't have the asm symlink, this symlink is in the include2 directory of the fake kernel tree instead # Starting 2.6.28, most include/asm headers were moved to arch//include/asm -REAL_KERNELSRC_INCLUDE_ASM := $(shell if test -e $(DLDR_KERNELSRC)/include2/asm; then echo $(DLDR_KERNELSRC)/include2/asm; else for p in arch/$(KERNELARCH)/include/asm include/asm; do if test -e $(DLDR_KERNELSRC)/$${p}; then echo $(REAL_KERNELSRC)/$${p}; exit 0; fi; done; fi) +REAL_KERNELSRC_INCLUDE_ASM := $(shell for p in $(DLDR_KERNELSRC)/include2/asm $(REAL_KERNELSRC)/arch/$(KERNELARCH)/include/asm; do if test -e $${p}; then echo $${p}; exit 0; fi; done; for p in arch/$(KERNELARCH)/include/asm include/asm; do if test -e $(DLDR_KERNELSRC)/$${p}; then echo $(REAL_KERNELSRC)/$${p}; exit 0; fi; done;) FOUND_PCI_DEV_SLOT_NAME := $(shell grep -q '[ ]slot_name' ${REAL_KERNELSRC}/include/linux/pci.h 2>/dev/null && echo -DFOUND_PCI_DEV_SLOT_NAME) EXTRA_CFLAGS+= $(FOUND_PCI_DEV_SLOT_NAME)