summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-11-20 14:55:13 +0000
committerrillig <rillig@pkgsrc.org>2005-11-20 14:55:13 +0000
commit43638dffb7d43ddc6698e4acb4ac3c305a865035 (patch)
treed846d88b05610fc02aa0da0225632b42af86031f
parentea203f1acb72801c3f5f77d6b9b628ae1238de0c (diff)
downloadpkgsrc-43638dffb7d43ddc6698e4acb4ac3c305a865035.tar.gz
Moved the "export BROKENF" command from the top of the program to the
point where it is actually used, which is when mk/bulk/pre-build.local is executed for allowing user-specific modifications before the build begins. That way it's easier to see why this command is necessary at all.
-rw-r--r--mk/bulk/pre-build4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index cd35ff629a3..6d33f0a7e1d 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.50 2005/08/26 07:24:53 reed Exp $
+# $NetBSD: pre-build,v 1.51 2005/11/20 14:55:13 rillig Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -25,7 +25,6 @@ PKGLINT_PKG_DIR=${USR_PKGSRC}/pkgtools/pkglint
# These have defaults set by bsd.bulk-pkg.mk and may be overridden in
# /etc/mk.conf
BROKENF=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BROKENFILE )`;
-export BROKENF
if [ "$BROKENF" = "" ]; then
echo "Had problems determining the name of the .broken files"
exit 1
@@ -277,6 +276,7 @@ if [ x"$BMAKE" = x"bmake" ]; then
fi
if [ -f mk/bulk/pre-build.local ]; then
+ export BROKENF
. mk/bulk/pre-build.local
fi