From c156ab5d4960a6242691ceae64768469739a36cc Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 27 Jan 2004 16:11:47 +0000 Subject: Replace all occurrences of the "MAIL" definition with MAIL_CMD, since some shells can set MAIL to be the mailbox of the user, and environment variables will override assignments in make when using conditional assignments. --- mk/bulk/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mk/bulk') diff --git a/mk/bulk/build b/mk/bulk/build index 17b9a447b03..3ffd859e457 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: build,v 1.33 2004/01/22 09:08:34 grant Exp $ +# $NetBSD: build,v 1.34 2004/01/27 16:11:47 agc Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer @@ -114,7 +114,7 @@ if [ -d pkgtools/pkglint ]; then AWK=`${BMAKE} show-var VARNAME=AWK` || fail=yes GREP=`${BMAKE} show-var VARNAME=GREP` || fail=yes SED=`${BMAKE} show-var VARNAME=SED` || fail=yes - MAIL=`${BMAKE} show-var VARNAME=MAIL` || fail=yes + MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD` || fail=yes MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes else echo "The pkgtools/pkglint directory does not exist. Please update" @@ -149,7 +149,7 @@ if [ $fail = "yes" -o \ -z "$AWK" -o \ -z "$GREP" -o \ -z "$SED" -o \ - -z "$MAIL" \ + -z "$MAIL_CMD" \ ]; then echo "ERROR: build failed to extract certain key variables." echo " please examine the above list and correct the" @@ -242,7 +242,7 @@ echo "Post processing bulk build results..." # Perl was wiped, reinstall it! ( cd lang/perl5 && ${BMAKE} bulk-install ) -perl mk/bulk/post-build | ${MAIL} -s "pkgsrc/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN +perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN # Done! echo "" -- cgit v1.2.3