diff --git a/mk.sh b/mk.sh
index da7633d..62a51bf 100755
--- a/mk.sh
+++ b/mk.sh
@@ -101,7 +101,7 @@ while read pkg; do
 
 		run_pkg_command "build"
 		run_pkg_command "deploy"
-		deploy_dev_cleanup "$PKGDEPLOYDIR"
+		deploy_dev_cleanup
 		strip_files ${PKGDEPLOYDIR}/{bin,lib}
 
 		for f in $SUBPKG; do
diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build
index 36c83db..d6dd525 100755
--- a/pkg/tc-gcc2/build
+++ b/pkg/tc-gcc2/build
@@ -34,7 +34,6 @@ deploy() {
 
 	mkdir -p "$DEPLOY/lib"
 	mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY"
-	deploy_dev_cleanup "$DEPLOY"
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
 
 	cat >> "$DEPLOY/libstdc++-dev.files" <<_EOF
diff --git a/util/misc.sh b/util/misc.sh
index 13fbbba..1f98a7d 100644
--- a/util/misc.sh
+++ b/util/misc.sh
@@ -29,13 +29,13 @@ strip_files() {
 deploy_dev_cleanup() {
 	local f
 
-	if [ -d "$1/share/pkgconfig" ]; then
-		mkdir -p "$1/lib/pkgconfig"
-		mv $1/share/pkgconfig/* "$1/lib/pkgconfig"
-		rmdir "$1/share/pkgconfig"
+	if [ -d "$PKGDEPLOYDIR/share/pkgconfig" ]; then
+		mkdir -p "$PKGDEPLOYDIR/lib/pkgconfig"
+		mv $PKGDEPLOYDIR/share/pkgconfig/* "$PKGDEPLOYDIR/lib/pkgconfig"
+		rmdir "$PKGDEPLOYDIR/share/pkgconfig"
 	fi
 
-	for f in ${1}/lib/*.la; do
+	for f in $PKGDEPLOYDIR/lib/*.la; do
 		[ ! -e "$f" ] || rm "$f"
 	done
 }