[src/trunk]: src/distrib/sets use ${make} instead of ${MAKE} in the shell scr...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/33a38ffde1d7
branches:  trunk
changeset: 539786:33a38ffde1d7
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Nov 26 06:22:22 2002 +0000

description:
use ${make} instead of ${MAKE} in the shell scripts, to prevent weird
lossage with the modified ${MAKE} getting passed to child make's

diffstat:

 distrib/sets/makeflist    |  20 ++++++++++----------
 distrib/sets/makeobsolete |   8 ++++----
 distrib/sets/maketars     |   8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (91 lines):

diff -r c7f52d88981d -r 33a38ffde1d7 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Tue Nov 26 06:12:59 2002 +0000
+++ b/distrib/sets/makeflist    Tue Nov 26 06:22:22 2002 +0000
@@ -1,19 +1,19 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.55 2002/11/25 23:29:54 lukem Exp $
+# $NetBSD: makeflist,v 1.56 2002/11/26 06:22:22 lukem Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
 #
 
 # set defaults
-MAKE="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
-machine=`${MAKE} print_machine`
-machine_arch=`${MAKE} print_machine_arch`
-machine_cpu=`${MAKE} print_machine_cpu`
-object_fmt=`${MAKE} print_object_fmt`
-toolchain_missing=`${MAKE} print_toolchain_missing`
-x11_version=`${MAKE} print_x11_version`
+make="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
+machine=`${make} print_machine`
+machine_arch=`${make} print_machine_arch`
+machine_cpu=`${make} print_machine_cpu`
+object_fmt=`${make} print_object_fmt`
+toolchain_missing=`${make} print_toolchain_missing`
+x11_version=`${make} print_x11_version`
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
@@ -29,8 +29,8 @@
                lists=$xlists
                ;;
        -a*)
-               machine_arch=`MACHINE_ARCH=${2} ${MAKE} print_machine_arch`
-               machine_cpu=`MACHINE_ARCH=${2} ${MAKE} print_machine_cpu`
+               machine_arch=`MACHINE_ARCH=${2} ${make} print_machine_arch`
+               machine_cpu=`MACHINE_ARCH=${2} ${make} print_machine_cpu`
                shift
                ;;
        -m*)
diff -r c7f52d88981d -r 33a38ffde1d7 distrib/sets/makeobsolete
--- a/distrib/sets/makeobsolete Tue Nov 26 06:12:59 2002 +0000
+++ b/distrib/sets/makeobsolete Tue Nov 26 06:22:22 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.15 2002/11/25 23:29:54 lukem Exp $
+# $NetBSD: makeobsolete,v 1.16 2002/11/26 06:22:23 lukem Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -8,9 +8,9 @@
 #
 
 # set defaults
-MAKE="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
-machine=`${MAKE} print_machine`
-arch=`${MAKE} print_machine_arch`
+make="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
+machine=`${make} print_machine`
+arch=`${make} print_machine_arch`
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
diff -r c7f52d88981d -r 33a38ffde1d7 distrib/sets/maketars
--- a/distrib/sets/maketars     Tue Nov 26 06:12:59 2002 +0000
+++ b/distrib/sets/maketars     Tue Nov 26 06:22:22 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.26 2002/11/25 23:29:54 lukem Exp $
+# $NetBSD: maketars,v 1.27 2002/11/26 06:22:23 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-a arch] [-m machine] [-s setsdir]
@@ -10,10 +10,10 @@
 # set defaults
 : ${PAX=pax}
 : ${MTREE=mtree}
-MAKE="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
+make="${MAKE:-make} -j 1 -f `dirname $0`/Makefile"
 
-machine=`${MAKE} print_machine`
-machine_arch=`${MAKE} print_machine_arch`
+machine=`${make} print_machine`
+machine_arch=`${make} print_machine_arch`
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"