diff options
| author | sketch <sketch@pkgsrc.org> | 2005-06-24 13:37:51 +0000 |
|---|---|---|
| committer | sketch <sketch@pkgsrc.org> | 2005-06-24 13:37:51 +0000 |
| commit | b4ff509f168f1941fa06cea3ecf2664609d2c901 (patch) | |
| tree | 1f9ab6f36c36655030731204642d167790764e4f /mk/bulk | |
| parent | 405fe625c6438e49947309e684827a651745b799 (diff) | |
| download | pkgsrc-b4ff509f168f1941fa06cea3ecf2664609d2c901.tar.gz | |
Use ${PERL5} instead of `perl' and relying on $PATH order.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bulk/build b/mk/bulk/build index 6a89606ec58..b622eb0831e 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: build,v 1.53 2005/06/24 08:29:59 dillo Exp $ +# $NetBSD: build,v 1.54 2005/06/24 13:37:51 sketch Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -203,6 +203,7 @@ if [ -d pkgtools/pkglint ]; then GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep` || fail=yes SED=`${BMAKE} show-var VARNAME=SED USE_TOOLS=sed` || fail=yes MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD USE_TOOLS=mail` || fail=yes + PERL5=`${BMAKE} show-var VARNAME=PERL5 USE_TOOLS=perl` || fail=yes MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes OPSYS=`${BMAKE} show-var VARNAME=OPSYS` || fail=yes OS_VERSION=`${BMAKE} show-var VARNAME=OS_VERSION` || fail=yes @@ -229,6 +230,7 @@ echo "AWK = $AWK" echo "GREP = $GREP" echo "SED = $SED" echo "MAIL_CMD = $MAIL_CMD" +echo "PERL5 = $PERL5" echo "MACHINE_ARCH = $MACHINE_ARCH" echo "OPSYS = $OPSYS" echo "OS_VERSION = $OS_VERSION" @@ -251,6 +253,7 @@ if [ $fail = "yes" -o \ -z "$GREP" -o \ -z "$SED" -o \ -z "$MAIL_CMD" -o \ + -z "$PERL5" -o \ -z "$MACHINE_ARCH" -o \ -z "$OPSYS" -o \ -z "$OS_VERSION" \ @@ -372,7 +375,7 @@ done # Perl was wiped, reinstall it! ( cd lang/perl5 && ${BMAKE} bulk-install ) -perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc ${OPSYS} ${OS_VERSION}/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN +${PERL5} mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc ${OPSYS} ${OS_VERSION}/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN # Done! echo "" |