diff options
| author | agc <agc> | 2002-08-07 10:56:11 +0000 |
|---|---|---|
| committer | agc <agc> | 2002-08-07 10:56:11 +0000 |
| commit | 320f3fec5f11b067c409667a8e22eb0eb0f604f2 (patch) | |
| tree | f64b34ef822f15e8ce86a64ff0cdfe3a5048be37 /mk/bulk/printindex | |
| parent | 64fba04637f842ab906b89604b77328b9ffa1d5e (diff) | |
| download | pkgsrc-320f3fec5f11b067c409667a8e22eb0eb0f604f2.tar.gz | |
Make these scripts useful on platforms other than NetBSD by using a BMAKE
environment variable, which contains the name of the make(1) program to
invoke - suggestion by Julien Letessier some time ago, the confusion mine,
since I thought he was referring to something else completely.
Don't rely on there being a POSIX tr(1) in the path by default - test
explicitly for both "yes" and "YES".
Set the default for PRUNEDISTFILES to "no", since we can't assume that
the user wants us to delete something which he may have been keeping
around, and there are other ways of accomplishing this aim (lintpkgsrc
-o, for example).
Clean up some superfluous white space at the end of lines.
Diffstat (limited to 'mk/bulk/printindex')
| -rw-r--r-- | mk/bulk/printindex | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/bulk/printindex b/mk/bulk/printindex index 27819b7ef28..bbfc1b8a253 100644 --- a/mk/bulk/printindex +++ b/mk/bulk/printindex @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: printindex,v 1.8 2001/12/01 12:32:08 hubertf Exp $ +# $NetBSD: printindex,v 1.9 2002/08/07 10:56:12 agc Exp $ # # # Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -69,11 +69,11 @@ do echo "but the directory does not exist. Please fix this!" > /dev/stderr else cd $pkgdir - pkgname=`make show-var VARNAME=PKGNAME` + pkgname=`${BMAKE} show-var VARNAME=PKGNAME` if [ $? != 0 ]; then echo "ERROR: printindex could not extract PKGNAME for $pkgdir" > /dev/stderr - echo "make show-var VARNAME=PKGNAME failed" > $brokenfile - make show-var VARNAME=PKGNAME >> $brokenfile 2>&1 + echo "${BMAKE} show-var VARNAME=PKGNAME failed" > $brokenfile + ${BMAKE} show-var VARNAME=PKGNAME >> $brokenfile 2>&1 #exit 1 fi echo "$pkgdir $pkgname " @@ -86,7 +86,7 @@ done # not be enabled for builds in pkgtools/xpkgwedge, but we may want to have # it listed in the index file. -cd $cwd/pkgtools/pkglint && BULK_PREREQ=`make show-var VARNAME=BULK_PREREQ` +cd $cwd/pkgtools/pkglint && BULK_PREREQ=`${BMAKE} show-var VARNAME=BULK_PREREQ` cd $cwd for pkgdir in $BULK_PREREQ @@ -97,11 +97,11 @@ do ;; *) cd $cwd/$pkgdir - pkgname=`make show-var VARNAME=PKGNAME` + pkgname=`${BMAKE} show-var VARNAME=PKGNAME` if [ $? != 0 ]; then echo "ERROR: printindex could not extract PKNAME for $pkgdir" > /dev/stderr - echo "make show-var VARNAME=PKGNAME failed" > $brokenfile - make show-var VARNAME=PKGNAME >> $brokenfile 2>&1 + echo "${BMAKE} show-var VARNAME=PKGNAME failed" > $brokenfile + ${BMAKE} show-var VARNAME=PKGNAME >> $brokenfile 2>&1 #exit 1 fi echo "$pkgdir $pkgname " |