From e4181e6fdea5cae605bc19a1f4919ee1060605f6 Mon Sep 17 00:00:00 2001
From: Mark Ferrell <major@homeonderanged.org>
Date: Wed, 16 Apr 2014 07:55:14 -0700
Subject: Fixup clean/distclean

 * Clean tmp files for a package out of BUILDER_TMPDIR during clean/distclean.
   This is particularly relivant after we added prepped/compiled staging data
   to temp.
---
 libexec/build-make-clean     | 4 ++--
 libexec/build-make-distclean | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libexec/build-make-clean b/libexec/build-make-clean
index ddc000c..8c5834d 100755
--- a/libexec/build-make-clean
+++ b/libexec/build-make-clean
@@ -15,8 +15,8 @@ build_make_clean()
 			# this file.
 			cat "var/db/binpkgs/${CATEGORY}/${NAME}" | xargs -0 rm  -f &
 		fi
-		if [ -d "${W}" ]; then
-			rm -rf "${W}" &
+		if [ -d "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" ]; then
+			rm -rf "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" &
 		fi
 
 		wait
diff --git a/libexec/build-make-distclean b/libexec/build-make-distclean
index ba39c6e..f3cc91a 100755
--- a/libexec/build-make-distclean
+++ b/libexec/build-make-distclean
@@ -14,8 +14,9 @@ build_make_distclean()
 		# this file.
 		cat "var/db/binpkgs/${CATEGORY}/${NAME}" | xargs -0 rm  -f &
 	fi
-	if [ -d "${W}" ]; then
-		rm -rf "${W}" &
+
+	if [ -d "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" ]; then
+		rm -rf "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" &
 	fi
 
 	wait
-- 
cgit v1.2.3-18-g5258