diff options
| author | nate <nate@FreeBSD.org> | 1995-04-05 04:10:58 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1995-04-05 04:10:58 +0000 |
| commit | 153c2880e32d76a07c36419f47e6dcb63b3eb9bf (patch) | |
| tree | b8cfe106dd9db4555e310d9060fe2e7837479d04 /sys/i386/conf | |
| parent | 9ca32a6be53704fcf27194f3317d537de6e8c571 (diff) | |
| download | FreeBSD-src-153c2880e32d76a07c36419f47e6dcb63b3eb9bf.zip FreeBSD-src-153c2880e32d76a07c36419f47e6dcb63b3eb9bf.tar.gz | |
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>
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/Makefile.i386 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 4bcd03f..14f8308 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.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} |
