From owner-freebsd-current Tue Apr 4 21:14:43 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.10/8.6.6) id VAA02173 for current-outgoing; Tue, 4 Apr 1995 21:14:43 -0700 Received: from trout.sri.MT.net (trout.sri.MT.net [204.182.243.12]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id VAA02167 for ; Tue, 4 Apr 1995 21:14:36 -0700 Received: (from nate@localhost) by trout.sri.MT.net (8.6.9/8.6.9) id WAA09370; Tue, 4 Apr 1995 22:18:09 -0600 Date: Tue, 4 Apr 1995 22:18:09 -0600 From: Nate Williams Message-Id: <199504050418.WAA09370@trout.sri.MT.net> In-Reply-To: Mike Pritchard "Re: cvs commit: src/sys/i386/conf Makefile.i386" (Apr 4, 6:31pm) X-Mailer: Mail User's Shell (7.2.5 10/14/92) To: Mike Pritchard Subject: Re: cvs commit: src/sys/i386/conf Makefile.i386 Cc: rkw@dataplex.net, current@FreeBSD.org Sender: current-owner@FreeBSD.org Precedence: bulk > Ok, how about conditionally adding /usr/include to the -I list. > E.g. in the kernel makefile do: > > .if !exist /usr/src/include > CFLAGS +=-I/usr/include > .endif > > (or whatever the correct makefile syntax is) > > If I have /usr/src/include installed then my kernel build uses the include > files from my source tree. If I simply downloaded just the kernel sources, > then it will pick up the include files from /usr/include. Thanks Mike. I used your ideas to cleanup the tree, which should now cause all nay-sayers to agree that given the current constraints, it *should* do the right thing. Basically, this allows folks who don't have the srcdist installed (basically the src/include directory) to pick up any necessary includes from /usr/include. However, if src/includes exists, then it will be used and /usr/include will never enter the picture. This means if you have an incomplete src/include tree you're hosed, but I guess if it's incomplete you're hosed anyway. Richard, is this an 'acceptable' solution? (I know it's not the best solution, but we don't have that yet) Nate