Modify behavior of INCLUDES to never look in /usr/include unless we

can't find the src/include directory.

Reviewed by:	"Rodney W. Grimes" <rgrimes@gndrsh.aac.dev.com>
Submitted by:	Mike Pritchard <pritc003@maroon.tc.umn.edu>
This commit is contained in:
Nate Williams 1995-04-05 04:10:58 +00:00
parent 3670011ae8
commit 070e3ec139
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=7627
3 changed files with 24 additions and 6 deletions

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.60 1995/03/28 08:02:37 bde Exp $
# $Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
#
# Makefile for FreeBSD
#
@ -36,7 +36,13 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit
#
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 -I$S/../include -I/usr/include
INCLUDES= -nostdinc -I. -I$S -I$S/sys
# 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} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
ASFLAGS=
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.60 1995/03/28 08:02:37 bde Exp $
# $Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
#
# Makefile for FreeBSD
#
@ -36,7 +36,13 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit
#
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 -I$S/../include -I/usr/include
INCLUDES= -nostdinc -I. -I$S -I$S/sys
# 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} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
ASFLAGS=
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.60 1995/03/28 08:02:37 bde Exp $
# $Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
#
# Makefile for FreeBSD
#
@ -36,7 +36,13 @@ CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit
#
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 -I$S/../include -I/usr/include
INCLUDES= -nostdinc -I. -I$S -I$S/sys
# 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} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
ASFLAGS=
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}