[pkgsrc/trunk]: pkgsrc/bootstrap don't override the CPPFLAGS and LDFLAGS envi...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e663bff6bde9
branches:  trunk
changeset: 489036:e663bff6bde9
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Feb 15 08:48:34 2005 +0000

description:
don't override the CPPFLAGS and LDFLAGS environment variables, add to
them instead.

diffstat:

 bootstrap/bootstrap |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 93a298433bf8 -r e663bff6bde9 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Feb 15 07:43:43 2005 +0000
+++ b/bootstrap/bootstrap       Tue Feb 15 08:48:34 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.29 2005/01/20 22:36:06 agc Exp $
+# $NetBSD: bootstrap,v 1.30 2005/02/15 08:48:34 grant Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -568,7 +568,7 @@
 fi
 
 echo_msg "Installing bmake"
-run_cmd "(cd $wrkdir/bmake; env CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure --prefix=$prefix --with-default-sys-path=$prefix/share/mk $configargs && 
make -f makefile.boot bootstrap && env BINDIR=$prefix/bin MANDIR=$prefix/man $BSTRAP_ENV ./bmake -f Makefile install)"
+run_cmd "(cd $wrkdir/bmake; env CPPFLAGS='$CPPFLAGS -I../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure --prefix=$prefix 
--with-default-sys-path=$prefix/share/mk $configargs && make -f makefile.boot bootstrap && env BINDIR=$prefix/bin MANDIR=$prefix/man $BSTRAP_ENV ./bmake -f Makefile install)"
 
 # bootstrap tnftp
 case "$DEBIAN" in
@@ -602,7 +602,7 @@
 case "$need_pax" in
 yes)   echo_msg "Installing pax"
        copy_src ../archivers/pax/files pax
-       run_cmd "(cd $wrkdir/pax; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && 
$prefix/bin/bmake && $prefix/bin/bmake install)"
+       run_cmd "(cd $wrkdir/pax; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix 
--sysconfdir=$sysconfdir && $prefix/bin/bmake && $prefix/bin/bmake install)"
        echo "PAX=$prefix/bin/pax" >> ${MKCONF_EXAMPLE}
        pkg_install_args="$pkg_install_args --with-pax=$prefix/bin/pax --with-tar=$prefix/bin/tar"
        ;;
@@ -615,7 +615,7 @@
 case "$need_mtree" in
 yes)   echo_msg "Installing mtree"
        copy_src ../pkgtools/mtree/files mtree
-       run_cmd "(cd $wrkdir/mtree; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && 
$prefix/bin/bmake && $prefix/bin/bmake install)"
+       run_cmd "(cd $wrkdir/mtree; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix 
--sysconfdir=$sysconfdir && $prefix/bin/bmake && $prefix/bin/bmake install)"
        pkg_install_args="$pkg_install_args --with-mtree=$prefix/sbin/mtree"
        ;;
 *)     pkg_install_args="$pkg_install_args --with-mtree=$mtreeprog"
@@ -626,7 +626,7 @@
 case "$need_sed" in
 yes)   echo_msg "Installing sed"
        copy_src ../textproc/nbsed/files sed
-       run_cmd "(cd $wrkdir/sed; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir 
--program-transform-name='s,sed,nbsed,' && make && make install)"
+       run_cmd "(cd $wrkdir/sed; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix 
--sysconfdir=$sysconfdir --program-transform-name='s,sed,nbsed,' && make && make install)"
        echo "SED=$prefix/bin/nbsed" >> ${MKCONF_EXAMPLE}
        BSTRAP_ENV="SED=\"$prefix/bin/nbsed\" $BSTRAP_ENV"
        ;;
@@ -639,7 +639,7 @@
 if [ "$prefix" = "/usr" ]; then
        pkg_install_mandir="$prefix/share/man"
 fi
-run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat -I../../libnbcompat' LDFLAGS='-L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C 
--prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$pkg_install_mandir $pkg_install_args && $prefix/bin/bmake && $prefix/bin/bmake install)"
+run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog 
./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$pkg_install_mandir $pkg_install_args && $prefix/bin/bmake && $prefix/bin/bmake install)"
 
 # all's ready, install the man page
 echo_msg "Installing packages(7) man page"