--- makepkg	2009-02-20 14:24:51.000000000 +0200
+++ /usr/bin/makepkg	2009-03-01 18:25:38.000000000 +0200
@@ -134,21 +134,11 @@
 # Clean up function. Called automatically when the script exits.
 ##
 clean_up() {
-	local EXIT_CODE=$?
-
-	if [ "$INFAKEROOT" = "1" ]; then
-		# Don't clean up when leaving fakeroot, we're not done yet.
-		return
-	fi
-
-	if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then
-		# If it's a clean exit and -c/--clean has been passed...
+	if [ "$CLEANUP" = "1" ]; then
+		# If -c/--clean has been passed...
 		msg "$(gettext "Cleaning up...")"
 		rm -rf "$pkgdir" "$srcdir"
-		if [ "$pkgname" != "" ]; then
-			# Can't do this unless the BUILDSCRIPT has been sourced.
-			rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*"
-		fi
+		rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*"
 	fi
 
 	remove_deps
@@ -158,7 +148,6 @@
 ##
 # Signal Traps
 ##
-trap 'clean_up' 0
 trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
 trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
 trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR
@@ -1639,6 +1628,8 @@
 
 msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))"
 
+clean_up
+
 install_package
 
 exit 0 #E_OK