Fix cleanup during clean/distclean

* Added a workdir variable ${W} which references the
  ${BUILDER_PKGDIR}/${NAME}/build, which allows distclean to clobber
  the entire workdir directory structer as opposed to just the extracted
  source directory structure.

3 files changed, 3 insertions, 2 deletions

diff --git a/bin/build b/bin/build
index cdbb16c..0610e08 100755
--- a/bin/build
+++ b/bin/build
@@ -118,6 +118,7 @@ import()
 	fi
 
 	D="${BUILDER_PKGDIR}/${NAME}/install"
+	W="${BUILDER_PKGDIR}/${NAME}/build"
 	S="${BUILDER_PKGDIR}/${NAME}/build/${NAME}-${VERSION}"
 	F="${BUILDER_PKGDIR}/${NAME}/files"
 	L="${BUILDER_PKGDIR}/${NAME}/log"
diff --git a/bin/builder/build-clean b/bin/builder/build-clean
index 9da7e24..dcc8811 100755
--- a/bin/builder/build-clean
+++ b/bin/builder/build-clean
@@ -8,7 +8,7 @@ if [ ! -z "${TOOLCHAIN}" ]; then
 	exit 0
 fi
 
-for dir in "${L}" "${S}" "${D}"; do
+for dir in "${L}" "${W}" "${D}"; do
 	if [ -d "${dir}" ]; then
 		rm -rf "${dir}" &
 	fi
diff --git a/bin/builder/build-distclean b/bin/builder/build-distclean
index 2b0abda..eba9c50 100755
--- a/bin/builder/build-distclean
+++ b/bin/builder/build-distclean
@@ -3,7 +3,7 @@
 echo "dist-cleaning: ${1}"
 import "${1}"
 
-for dir in "${L}" "${S}" "${D}"; do
+for dir in "${L}" "${W}" "${D}"; do
 	if [ -d "${dir}" ]; then
 		rm -rf "${dir}" &
 	fi