From 15787a3d0c8cd45aa32a4926532806e7e9c7c50f Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Fri, 9 Jun 2006 02:31:22 +0000
Subject: [PATCH] small adjustment to delete before unpack routine, better
 handling of non-standard names

---
 common/common-functions | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/common-functions b/common/common-functions
index 916d77e..354bc04 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -218,8 +218,8 @@ cat << EOF
 	ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
 	[[ -n \$\$ROOT ]] && \\
 	rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
-	if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build ]; then \\
-		rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build; \\
+	if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build ]; then \\
+		rm -rf \$(MOUNT_PT)\$(SRC)/${PKG_NAME%-*}-build; \\
 	fi;
 EOF
 ) >> $MKFILE.tmp
@@ -235,8 +235,8 @@ cat << EOF
 	ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
 	[[ -n \$\$ROOT ]] && \\
 	rm -rf \$(SRC)/\$\$ROOT && \\
-	if [ -e \$(SRC)/${PKG_NAME%%-*}-build ]; then \\
-		rm -rf \$(SRC)/${PKG_NAME%%-*}-build; \\
+	if [ -e \$(SRC)/${PKG_NAME%-*}-build ]; then \\
+		rm -rf \$(SRC)/${PKG_NAME%-*}-build; \\
 	fi;
 EOF
 ) >> $MKFILE.tmp