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.

5 files changed, 33 insertions, 28 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 6fc5507779d6..eb79ab78b197 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -42,6 +42,11 @@ COPTFLAGS?=-O -pipe
 COPTFLAGS+= ${_CPUCFLAGS}
 .endif
 INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
+
+# This hack lets us use the ipfilter code without spamming a new
+# include path into 100+ source files.
+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
@@ -49,10 +54,6 @@ INCLUDES+= -I$S/../include
 INCLUDES+= -I/usr/include
 .endif
 
-# This hack lets us use the ipfilter code without spamming a new
-# include path into 100+ source files.
-INCLUDES+= -I$S/contrib/ipfilter
-
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 07e03cfcaaed..ec4b719ad597 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}
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 194210730637..174c72774576 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -52,12 +52,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.
@@ -66,6 +60,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}
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 004e50f01c41..f194f8757754 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -44,12 +44,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.
@@ -58,6 +52,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}
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 07e03cfcaaed..ec4b719ad597 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -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}