From c5489d9047f3e34ce65624bcc100309a2fbc5909 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 26 Feb 1995 05:05:53 +0000
Subject: [PATCH] Use relative include path and -nostdinc avoid getting
 anything from /usr/include.

---
 sys/conf/Makefile.i386      | 5 +++--
 sys/conf/Makefile.powerpc   | 5 +++--
 sys/i386/conf/Makefile.i386 | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index f379d192326..663ebee8eaa 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.53 1995/01/25 21:40:00 bde Exp $
+#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,7 +41,8 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 # of material assistance.
 #
 COPTFLAGS?=-O
-INCLUDES= -I. -I$S -I$S/sys
+# Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
+INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index f379d192326..663ebee8eaa 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.53 1995/01/25 21:40:00 bde Exp $
+#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,7 +41,8 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 # of material assistance.
 #
 COPTFLAGS?=-O
-INCLUDES= -I. -I$S -I$S/sys
+# Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
+INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index f379d192326..663ebee8eaa 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.53 1995/01/25 21:40:00 bde Exp $
+#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,7 +41,8 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 # of material assistance.
 #
 COPTFLAGS?=-O
-INCLUDES= -I. -I$S -I$S/sys
+# Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
+INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}