Move the -I../../../include or -I/usr/include to the last entry on the

cc arguments.  Otherwise ipfilter's bogus #include lines will compile
reference /usr/include/netinet/ip_frag.h etc.

1 files changed, 7 insertions, 6 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 07e03cf..ec4b719 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -42,12 +42,6 @@ COPTFLAGS?=-O -pipe
 COPTFLAGS+= ${_CPUCFLAGS}
 .endif
 INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
-# This hack is to allow kernel compiles to succeed on machines w/out srcdist
-.if exists($S/../include)
-INCLUDES+= -I$S/../include
-.else
-INCLUDES+= -I/usr/include
-.endif
 
 # This hack lets us use the Intel ACPICA code without spamming a new 
 # include path into 100+ source files.
@@ -56,6 +50,13 @@ INCLUDES+= -I$S/contrib/dev/acpica
 # ... and the same for ipfilter
 INCLUDES+= -I$S/contrib/ipfilter
 
+# This hack is to allow kernel compiles to succeed on machines w/out srcdist
+.if exists($S/../include)
+INCLUDES+= -I$S/../include
+.else
+INCLUDES+= -I/usr/include
+.endif
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}