From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 4 Mar 2015 09:27:33 +0000 (+0200)
Subject: configure/make: Fix path to autoconf.h and remove config.h
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f2b3c6b0b3327f8a5e2947d9b0d2130ab46a7ae2;p=~emulex%2Ffor-vlad%2Fold%2Fcompat-rdma.git

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 295a5ee..03a0762 100755
--- 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 a513d92..e135654 100644
--- 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) \