diff options
author | ru <ru@FreeBSD.org> | 2002-03-22 18:36:41 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-03-22 18:36:41 +0000 |
commit | 6740a56f485a6a61f0114f4ac3e9bbcae8d0456e (patch) | |
tree | 8f183038277baed8ef848debefc0882f69579476 /release | |
parent | f4f7155d4020408e3cd838fbc05f34cc05e41bcd (diff) | |
download | FreeBSD-src-6740a56f485a6a61f0114f4ac3e9bbcae8d0456e.zip FreeBSD-src-6740a56f485a6a61f0114f4ac3e9bbcae8d0456e.tar.gz |
DESTDIR does not anymore does the -I${DESTDIR}/usr/include magic
in <bsd.prog.mk> and <bsd.lib.mk>.
Reviewed by: luigi
Diffstat (limited to 'release')
-rwxr-xr-x | release/picobsd/build/picobsd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index 04ff918..ab1fdad 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -151,15 +151,15 @@ create_includes_and_libraries() { mkdir -p ${l_usrtree}/share/misc # a few things go here mkdir -p ${l_usrtree}/lib # libraries mkdir -p ${l_usrtree}/sbin # some binaries - (cd ${SRC}; INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${SRC}/.. \ + (cd ${SRC}; INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk includes ) || fail $? includes - # libraries already have the include path in the Makefile - CFLAGS="-nostdinc" ; export CFLAGS + # Pick up the correct headers for libraries. + CFLAGS="-nostdinc -I${l_usrtree}/include" ; export CFLAGS (cd ${SRC} # $e is the invocation of make with correct environment e="MAKEOBJDIRPREFIX=${l_objtree}/picobsd/libraries \ - INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${SRC}/.. \ + INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk \ -DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG " log "do a 'make obj' in a few places." |