[netfilter-cvslog] r6906 - trunk/iptables

[kaber at trash.net]

Author: kaber at trash.net
Date: 2007-07-15 19:13:24 +0200 (Sun, 15 Jul 2007)
New Revision: 6906

Modified:
   trunk/iptables/Makefile
Log:
[PATCH] Change default KERNEL_DIR location and add KBUILD_OUTPUT (Sven Wegener <sven.wegener at stealer.net>)


Modified: trunk/iptables/Makefile
===================================================================
--- trunk/iptables/Makefile	2007-07-13 15:07:10 UTC (rev 6905)
+++ trunk/iptables/Makefile	2007-07-15 17:13:24 UTC (rev 6906)
@@ -11,9 +11,15 @@
 # Standard part of Makefile for topdir.
 TOPLEVEL_INCLUDED=YES
 
+# For recent kernels we only need the source in KERNEL_DIR to build. Older
+# kernels have a bug, where linux/netfilter_ipv4.h includes linux/config.h,
+# which includes linux/autoconf.h, which is placed into KBUILD_OUTPUT.
 ifndef KERNEL_DIR
-KERNEL_DIR="/lib/modules/$(shell uname -r)/build"
+KERNEL_DIR="/lib/modules/$(shell uname -r)/source"
 endif
+ifndef KBUILD_OUTPUT
+KBUILD_OUTPUT="/lib/modules/$(shell uname -r)/build"
+endif
 IPTABLES_VERSION:=1.3.8
 OLD_IPTABLES_VERSION:=1.3.7
 
@@ -37,7 +43,7 @@
 endif
 
 COPT_FLAGS:=-O2
-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
+CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KBUILD_OUTPUT)/include -I$(KERNEL_DIR)/include -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
 
 ifdef NO_SHARED_LIBS
 CFLAGS += -DNO_SHARED_LIBS=1