summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2006-10-02 16:37:22 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2006-10-02 16:37:22 +0000
commit74c579fb190e20a6db3ddad64963aeeead148b46 (patch)
tree8fcf3ae783ef2bdabc06bff7270ed6df3bfc3ad3
parent56b5590c2fb0c59eae0ba420ad73a60506227dc6 (diff)
downloadpkgsrc-74c579fb190e20a6db3ddad64963aeeead148b46.tar.gz
Change the quoting to let this work with solaris-2.9 /bin/sh.
The particular /bin/sh bug that was biting here is "${x}"/*/*/"$y" doesn't expand the *'s if $y starts with a "." which, unfortunately, it does. Using "${x}"/*/*/$y works correctly.
-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 1ef77c8adfb..355d24a617b 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.60 2006/02/12 05:00:33 rillig Exp $
+# $NetBSD: pre-build,v 1.61 2006/10/02 16:37:22 dmcmahill Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -165,7 +165,7 @@ rm -fr /tmp/mod*
# Clean up state files
cd "${USR_PKGSRC}"
echo "pre-build> Cleaning up leftover state files from previous runs"
-rm -f "${BULKFILESDIR}"/*/*/"$BROKENF" "${BULKFILESDIR}"/*/*/"$BRKWRKLOG" "${BULKFILESDIR}"/*/*/"$BLDLOG"
+rm -f "${BULKFILESDIR}"/*/*/$BROKENF "${BULKFILESDIR}"/*/*/$BRKWRKLOG "${BULKFILESDIR}"/*/*/$BLDLOG
rm -f "${BULKFILESDIR}/$BROKENF" "${BULKFILESDIR}/$BRKWRKLOG" "${BULKFILESDIR}/$BLDLOG" "$STARTFILE"