diff options
author | agc <agc@pkgsrc.org> | 2002-08-12 08:46:54 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2002-08-12 08:46:54 +0000 |
commit | 7832e64d14ec0716a79e14f118039d6f6996f0de (patch) | |
tree | 167cfad5cced6b43d304eb37b234caf1c85b3f6d /mk/bulk | |
parent | 46b73dafe284bcf8154c7f9447b131270df9d348 (diff) | |
download | pkgsrc-7832e64d14ec0716a79e14f118039d6f6996f0de.tar.gz |
Don't assume that this is a shell script - instead, realise that it's
written in perl, and call the environment variable "BMAKE" accordingly
(it's set to the name of the NetBSD make(1) program).
Diffstat (limited to 'mk/bulk')
-rw-r--r-- | mk/bulk/post-build | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mk/bulk/post-build b/mk/bulk/post-build index d5bace8ec4d..f3f88279a43 100644 --- a/mk/bulk/post-build +++ b/mk/bulk/post-build @@ -1,5 +1,5 @@ #!/usr/pkg/bin/perl -# $NetBSD: post-build,v 1.19 2002/08/07 10:56:12 agc Exp $ +# $NetBSD: post-build,v 1.20 2002/08/12 08:46:54 agc Exp $ # # Collect stuff after a pkg bulk build # @@ -40,18 +40,18 @@ $reportf=basename($REPORT); # extract the name of the files used for the build log and broken build log. # these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf -chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=BROKENFILE )`); +chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`); # also extract the names of the cache files used during the bulk build. We'll save a copy of # those to help debug if the build messed up. -chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DEPENDSTREEFILE )`); -chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DEPENDSFILE )`); -chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=SUPPORTSFILE )`); -chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=INDEXFILE )`); -chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=ORDERFILE )`); -chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=STARTFILE )`); -chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=LOCALBASE )`); -chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; ${BMAKE} show-var VARNAME=X11BASE )`); +chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSTREEFILE )`); +chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSFILE )`); +chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`); +chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`); +chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`); +chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`); +chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`); +chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`); $dtfile=basename($DEPENDSTREEFILE); $depfile=basename($DEPENDSFILE); $supfile=basename($SUPPORTSFILE); @@ -142,7 +142,7 @@ while (<BF>) { chomp($whofile); ($who,$file) = split(/\s+/, $whofile); - # $maintainer=`( cd $USR_PKGSRC/$pkg ; ( echo '.include "Makefile"' ; echo 'bla: ; \@echo ${MAINTAINER}' ) | ${BMAKE} -f - bla )`; + # $maintainer=`( cd $USR_PKGSRC/$pkg ; ( echo '.include "Makefile"' ; echo 'bla: ; \@echo ${MAINTAINER}' ) | $ENV{"BMAKE"} -f - bla )`; $maintainer=`grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile | awk '{ print \$2\$3\$4\$5\$6}' | sed -e 's/\</</g' -e 's/\>/>/g'`; chomp($maintainer); |