summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig>2006-10-07 06:35:01 +0000
committerrillig <rillig>2006-10-07 06:35:01 +0000
commit84d7ea086002b7e6e0c7f44d17def44246a46e78 (patch)
tree31b710dc76f8f02228a137198294c3ff062f34b0 /mk
parent41158354b2d2998476bb9a73a84e1050f9cb8fad (diff)
downloadpkgsrc-84d7ea086002b7e6e0c7f44d17def44246a46e78.tar.gz
Renamed the "pack" option for _PRESERVE_WRKSRC to "pack-if-failed",
since that's what I really wanted. It's just one day old, so I hope that nobody has gotten used to it.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index b59dcb67e71..807c95a536e 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.123 2006/10/06 09:41:23 rillig Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.124 2006/10/07 06:35:01 rillig Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -184,8 +184,9 @@ BULK_MSG_CONT?= ${ECHO_MSG} " "
#
# If this is "yes", the working directory will not be cleaned after building
-# the package. It can also be set to "pack" to save a .tar.gz file of the
-# working directory in BULKFILESDIR instead of keeping the files.
+# the package. It can also be set to "pack-if-failed" to save a .tar.gz
+# file of the working directory in BULKFILESDIR instead of keeping the files,
+# but only if the package failed to build.
_PRESERVE_WRKDIR?= no
# create an escaped version of PKGPATH. We do this because
@@ -535,7 +536,7 @@ bulk-package:
${ECHO} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${BULKFILESDIR:Q}/${BROKENFILE:Q} \
) 2>&1 | ${TEE} -a ${_BROKENFILE:Q}; \
fi ; \
- if [ ${_PRESERVE_WRKDIR} = "pack" ]; then \
+ if [ ${_PRESERVE_WRKDIR} = "pack-if-failed" ] && [ ! -f ${PKGFILE} ]; then \
(cd ${WRKDIR} \
&& ${PAX} -wz -f ${_BULK_PKGLOGDIR}/wrkdir.tar.gz . \
) || ${TRUE}; \