| 1 | --- a/src/Makefile.am |
| 2 | +++ b/src/Makefile.am |
| 3 | @@ -639,7 +639,7 @@ if KERNEL_2_6 |
| 4 | drv_ifxos_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_ifxos_SOURCES)))" |
| 5 | |
| 6 | drv_ifxos.ko: $(drv_ifxos_SOURCES) |
| 7 | - @echo -e "drv_ifxos: Making Linux 2.6.x kernel object" |
| 8 | + @echo "drv_ifxos: Making Linux 2.6.x kernel object" |
| 9 | if test ! -e common/ifxos_debug.c ; then \ |
| 10 | echo "copy source files (as links only!)"; \ |
| 11 | for f in $(filter %.c,$(drv_ifxos_SOURCES)); do \ |
| 12 | @@ -647,10 +647,10 @@ drv_ifxos.ko: $(drv_ifxos_SOURCES) |
| 13 | cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \ |
| 14 | done \ |
| 15 | fi |
| 16 | - @echo -e "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild |
| 17 | - @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild |
| 18 | - @echo -e "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)" >> $(PWD)/Kbuild |
| 19 | - @echo -e "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild |
| 20 | + @echo "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild |
| 21 | + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild |
| 22 | + @echo "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)" >> $(PWD)/Kbuild |
| 23 | + @echo "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild |
| 24 | $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules |
| 25 | |
| 26 | clean-generic: |
| 27 | --- a/configure.in |
| 28 | +++ b/configure.in |
| 29 | @@ -64,7 +64,7 @@ dnl Set kernel build path |
| 30 | AC_ARG_ENABLE(kernelbuild, |
| 31 | AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path (only for kernel 2.6.x)), |
| 32 | [ |
| 33 | - if test -e $enableval/include/linux/autoconf.h; then |
| 34 | + if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then |
| 35 | AC_SUBST([KERNEL_BUILD_PATH],[$enableval]) |
| 36 | else |
| 37 | AC_MSG_ERROR([The kernel build directory is not valid or not configured!]) |
| 38 | |
