makepkg: adjust log clean-up for new filenames

The log files now have -build or -package at the end and there
are separate log files for each *_package() function. Alter
clean_up() to deal with this. Also, move glob outside quotes so
this actually works.

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 95ee5200..ff2663b8 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -155,7 +155,14 @@ clean_up() {
 		rm -rf "$pkgdir" "$srcdir"
 		if [ -n "$pkgname" ]; then
 			# Can't do this unless the BUILDSCRIPT has been sourced.
-			rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*"
+			rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"*
+			if [ "$PKGFUNC" -eq 1 ]; then
+				rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
+			elif [ "$SPLITPKG" -eq 1 ]; then
+				for pkg in ${pkgname[@]}; do
+					rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
+				done
+			fi
 		fi
 	fi