Pass MAKE_SET_VARS with environment variables instead of make flags,

or it will be passwd down to subsequent make (ex. installation of dependencies)
and result in unwanted behaviour.

2 files changed, 11 insertions, 11 deletions

diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index bed3f72e17b..e1b389dcdaf 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2010/12/20 15:39:09 gdt Exp $
+# $NetBSD: Makefile,v 1.32 2011/03/22 04:04:58 obache Exp $
 
-DISTNAME=	pkg_rolling-replace-0.23
+DISTNAME=	pkg_rolling-replace-0.24
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -28,7 +28,7 @@ SUBST_CLASSES+=		tools
 SUBST_STAGE.tools=	pre-configure
 SUBST_MESSAGE.tools=	Substituting tool locations.
 SUBST_FILES.tools=	pkg_rolling-replace.sh
-SUBST_VARS.tools=	PKG_INFO_CMD MAKE PKG_CHK AWK MKDIR
+SUBST_VARS.tools=	PKG_INFO_CMD MAKE PKG_CHK AWK MKDIR SETENV
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index 8c2442bcb2d..996059db250 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.30 2010/12/20 15:39:09 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.31 2011/03/22 04:04:58 obache Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -460,8 +460,8 @@ while [ -n "$REPLACE_TODO" ]; do
 	OLD_DEPENDS=$(${PKG_INFO} -Nq $pkg | sed 's/-[0-9][^-]*$//')
 	NEW_DEPENDS=
 	cd "$PKGSRCDIR/$pkgdir"
-	bdeps=$(${MAKE} ${MAKE_SET_VARS} show-depends VARNAME=BUILD_DEPENDS)
-	rdeps=$(${MAKE} ${MAKE_SET_VARS} show-depends)
+	bdeps=$(@SETENV@ ${MAKE_SET_VARS} ${MAKE} show-depends VARNAME=BUILD_DEPENDS)
+	rdeps=$(@SETENV@ ${MAKE_SET_VARS} ${MAKE} show-depends)
 	for depver in $bdeps $rdeps; do
 	    dep=$(echo $depver | sed -e 's/[:[].*$/0/' -e 's/[<>]=/-/' \
 		-e 's/-[0-9][^-]*$//')
@@ -501,7 +501,7 @@ while [ -n "$REPLACE_TODO" ]; do
     if [ -z "$fail" ]; then
 	if [ -z "$opt_F" ]; then
 	    echo "${OPI} Replacing $pkgname"
-	    cmd="${MAKE} ${MAKE_SET_VARS} clean || fail=1"
+	    cmd="@SETENV@ ${MAKE_SET_VARS} ${MAKE} clean || fail=1"
 	    if [ -n "$opt_n" ]; then
 		echo "${OPI} Would run: $cmd"
 	    else
@@ -515,10 +515,10 @@ while [ -n "$REPLACE_TODO" ]; do
 		    error "'make clean' failed for package $pkg."
 		fi
 	    fi
-	    cmd="${MAKE} ${MAKE_SET_VARS} replace || fail=1" # XXX OLDNAME= support? xmlrpc-c -> xmlrpc-c-ss
+	    cmd="@SETENV@ ${MAKE_SET_VARS} ${MAKE} replace || fail=1" # XXX OLDNAME= support? xmlrpc-c -> xmlrpc-c-ss
 	else
 	    echo "${OPI} Fetching $pkgname"
-	    cmd="${MAKE} ${MAKE_SET_VARS} fetch depends-fetch || fail=1"
+	    cmd="@SETENV@ ${MAKE_SET_VARS} ${MAKE} fetch depends-fetch || fail=1"
 	fi
     fi
 
@@ -546,7 +546,7 @@ while [ -n "$REPLACE_TODO" ]; do
     # If -r not given, make a binary package.
     if [ -z "$opt_r" -a -z "$fail" -a -z "$opt_F" ]; then
 	echo "${OPI} Packaging $(${PKG_INFO} -e $pkg)"
-	cmd="${MAKE} ${MAKE_SET_VARS} package || fail=1"
+	cmd="@SETENV@ ${MAKE_SET_VARS} ${MAKE} package || fail=1"
 	if [ -n "$opt_n" -a -z "$fail" ]; then
 	    echo "${OPI} Would run: $cmd"
 	elif [ -z "$fail" ]; then
@@ -563,7 +563,7 @@ while [ -n "$REPLACE_TODO" ]; do
     fi
     # Clean
     if [ -z "$opt_n" -a -z "$fail" -a -z "$opt_F" ]; then
-        cmd="${MAKE} ${MAKE_SET_VARS} clean || fail=1"
+        cmd="@SETENV@ ${MAKE_SET_VARS} ${MAKE} clean || fail=1"
         if [ -n "$logfile" ]; then
             eval "$cmd" >&3 2>&3
         else