Index: server/buildpkgs/build_all.sh
==================================================================
--- server/buildpkgs/build_all.sh
+++ server/buildpkgs/build_all.sh
@@ -21,12 +21,13 @@
 
 CONFIGUREEXTRA="$@"
 export CONFIGUREEXTRA
 
 # Determine path to "tclConfig.sh"
-rm -rf tcl/build tcl/inst
+rm -rf tcl/build tcl/inst-*
 rm -f platform.magic.*
+rm -rf */out
 if [ "${DISTCLEAN}" = "1" ]; then
 	rm -rf tcl
 fi
 
 if [ "${CLEANONLY}" = "0" ]; then

Index: server/buildpkgs/dbus-tcl/build.sh
==================================================================
--- server/buildpkgs/dbus-tcl/build.sh
+++ server/buildpkgs/dbus-tcl/build.sh
@@ -35,10 +35,12 @@
 	${MAKE:-make} || exit 1
 
 	${MAKE:-make} install-binaries PKG_DIR='' || exit 1
 
 	rm -f "${PLATDIR}"/*.a
+	mv "${PLATDIR}"/dbus-tcl/* "${PLATDIR}"/
+	rm -rf "${PLATDIR}"/dbus-tcl
 ) || exit 1
 
 # Create metadata
 ../create_teapot "${PLATDIR}/teapot.txt" "dbus-tcl" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.5" "The DBus-Tcl project provides a Tcl interface to the dbus message bus system. It contains packages that allow Tcl programs to send and receive dbus signals, as well as invoke and respond to dbus method calls.  http://dbus-tcl.sourceforge.net/"