? p
Index: Makefile.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.alpha,v
retrieving revision 1.100
diff -u -r1.100 Makefile.alpha
--- Makefile.alpha	2001/06/07 04:06:20	1.100
+++ Makefile.alpha	2001/06/12 05:57:31
@@ -42,16 +42,17 @@
 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
 .else
 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}
Index: Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.234
diff -u -r1.234 Makefile.i386
--- Makefile.i386	2001/06/07 04:06:20	1.234
+++ Makefile.i386	2001/06/12 05:57:31
@@ -42,12 +42,6 @@
 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.
@@ -55,6 +49,13 @@
 
 # ... 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}
Index: Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.ia64,v
retrieving revision 1.23
diff -u -r1.23 Makefile.ia64
--- Makefile.ia64	2001/06/07 04:06:20	1.23
+++ Makefile.ia64	2001/06/12 05:57:31
@@ -52,12 +52,6 @@
 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.
@@ -65,6 +59,13 @@
 
 # ... 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}
Index: Makefile.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v
retrieving revision 1.133
diff -u -r1.133 Makefile.pc98
--- Makefile.pc98	2001/06/07 04:06:20	1.133
+++ Makefile.pc98	2001/06/12 05:57:31
@@ -44,12 +44,6 @@
 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.
@@ -57,6 +51,13 @@
 
 # ... 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}
Index: Makefile.powerpc
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.powerpc,v
retrieving revision 1.234
diff -u -r1.234 Makefile.powerpc
--- Makefile.powerpc	2001/06/07 04:06:20	1.234
+++ Makefile.powerpc	2001/06/12 05:57:31
@@ -42,12 +42,6 @@
 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.
@@ -55,6 +49,13 @@
 
 # ... 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}