configure/make: Fix path to autoconf.h and remove config.h

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/configure b/configure
index 295a5ee9d63c2857a13bf89d74c9f5281d22224f..03a07624e58878780afbd29d87b09631458948d6 100755 (executable)
--- a/configure
+++ b/configure
@@ -742,8 +742,14 @@ esac
 CWD=$(pwd)
 CONFIG="configure.mk.kernel"
 
-mkdir -p ${CWD}/include/linux
-AUTOCONF_H="${CWD}/include/linux/autoconf.h"
+
+if (/bin/ls -1 $KSRC/include/*/autoconf.h 2>/dev/null | head -1 | grep -q generated); then
+    AUTOCONF_PREFIX=generated
+else
+    AUTOCONF_PREFIX=linux
+fi
+mkdir -p ${CWD}/include/${AUTOCONF_PREFIX}
+AUTOCONF_H="${CWD}/include/${AUTOCONF_PREFIX}/autoconf.h"
 
 # disable unsupported modules on 32bit
 if [ $ARCH != "x86_64" ]; then

diff --git a/makefile b/makefile
index a513d92265e8a956993c32ee9d002faf4f7f56bf..e1356543e9b5d4a8f78c4af2e172541554c5b9a6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -144,9 +144,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                -D__OFED_BUILD__ \
                $(CFLAGS) \
                -include $(autoconf_h) \
-               -include $(CWD)/include/linux/autoconf.h \
                $(KCONFIG_H) \
-               -include $(CWD)/compat/config.h \
                -include $(CWD)/include/linux/compat-2.6.h \
                $(BACKPORT_INCLUDES) \
                $(KERNEL_MEMTRACK_CFLAGS) \