From e2e0d560a2f1a5654e0ae6d555980631154e4c4e Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Fri, 27 Sep 1996 16:34:16 +0000 Subject: [PATCH] Added -I- to ${INCLUDES}. This makes 4.4Lite's (mis?)use of "foo.h" for headers in the compile directory work unsurprisingly. Without -I-, the search for "foo.h" begins in the directory of the file that includes it, and the compile directory is only searched because `-I.' is in ${INCLUDES}. Removed -I$S/sys from ${INCLUDES}. It was once necessary to find things like "param.h" in $S/sys. Now is found in $S. --- sys/conf/Makefile.i386 | 5 ++--- sys/conf/Makefile.powerpc | 5 ++--- sys/i386/conf/Makefile.i386 | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index bf60da17f72d..f452c0b7135f 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.86 1996/08/21 16:31:34 ache Exp $ +# $Id: Makefile.i386,v 1.87 1996/08/31 14:47:08 bde Exp $ # # Makefile for FreeBSD # @@ -37,8 +37,7 @@ CWARNFLAGS?= -W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit \ # of material assistance. # COPTFLAGS?=-O -# Not ready for -I- yet. #include "foo.h" where foo.h is in the srcdir fails. -INCLUDES= -nostdinc -I. -I$S -I$S/sys +INCLUDES= -nostdinc -I- -I. -I$S # This hack is to allow kernel compiles to succeed on machines w/out srcdist .if exists($S/../include) INCLUDES+= -I$S/../include diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index bf60da17f72d..f452c0b7135f 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.86 1996/08/21 16:31:34 ache Exp $ +# $Id: Makefile.i386,v 1.87 1996/08/31 14:47:08 bde Exp $ # # Makefile for FreeBSD # @@ -37,8 +37,7 @@ CWARNFLAGS?= -W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit \ # of material assistance. # COPTFLAGS?=-O -# Not ready for -I- yet. #include "foo.h" where foo.h is in the srcdir fails. -INCLUDES= -nostdinc -I. -I$S -I$S/sys +INCLUDES= -nostdinc -I- -I. -I$S # This hack is to allow kernel compiles to succeed on machines w/out srcdist .if exists($S/../include) INCLUDES+= -I$S/../include diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index bf60da17f72d..f452c0b7135f 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.86 1996/08/21 16:31:34 ache Exp $ +# $Id: Makefile.i386,v 1.87 1996/08/31 14:47:08 bde Exp $ # # Makefile for FreeBSD # @@ -37,8 +37,7 @@ CWARNFLAGS?= -W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit \ # of material assistance. # COPTFLAGS?=-O -# Not ready for -I- yet. #include "foo.h" where foo.h is in the srcdir fails. -INCLUDES= -nostdinc -I. -I$S -I$S/sys +INCLUDES= -nostdinc -I- -I. -I$S # This hack is to allow kernel compiles to succeed on machines w/out srcdist .if exists($S/../include) INCLUDES+= -I$S/../include