diff -urN hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-debian_tree/modules/Makefile --- hsfmodem-7.80.02.04full/modules/Makefile 2009-04-23 21:03:57.000000000 -0400 +++ hsfmodem-7.80.02.04full-debian_tree/modules/Makefile 2009-05-05 15:06:08.000000000 -0400 @@ -69,11 +69,11 @@ # patsubst used here since CNXT_MODS_DIR may be overridden to point to /binaries/ directory without /extra or /updates. CNXT_SND_MODS_DIR := $(patsubst %/extra,%/updates,$(CNXT_MODS_DIR)) -# On SuSE 9.0 and up, CNXT_KERNELSRC points to an incomplete kernel source +# On SuSE 9.0 and up as well as Debian 2.6.29-1-* kernels and up, CNXT_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\) ' "${CNXT_KERNELSRC}/Makefile" 2>/dev/null && [ -d "${CNXT_KERNELSRC}" ]; then echo "yes"; else echo "no"; fi) +DIFF_OBJ_TREE := $(shell if grep -q '^\(KERNELSRC\)\|\(MAKEARGS\) ' "${CNXT_KERNELSRC}/Makefile" 2>/dev/null && [ -d "${CNXT_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; }' "${CNXT_KERNELSRC}/Makefile") # Deal with a relative path REAL_KERNELSRC := $(if $(filter ../%, $(REAL_KERNELSRC)), $(CNXT_KERNELSRC)/,)$(REAL_KERNELSRC) @@ -85,7 +85,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 $(CNXT_KERNELSRC)/include2/asm; then echo $(CNXT_KERNELSRC)/include2/asm; else for p in arch/$(KERNELARCH)/include/asm include/asm; do if test -e $(CNXT_KERNELSRC)/$${p}; then echo $(REAL_KERNELSRC)/$${p}; exit 0; fi; done; fi) +REAL_KERNELSRC_INCLUDE_ASM := $(shell for p in $(CNXT_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 $(CNXT_KERNELSRC)/$${p}; then echo $(REAL_KERNELSRC)/$${p}; exit 0; fi; done;) ifeq ($(CNXTTARGET),hsf) REPLACE_HDA := true