Index: kitsh/build.sh
==================================================================
--- kitsh/build.sh
+++ kitsh/build.sh
@@ -32,10 +32,23 @@
 	cd "${BUILDDIR}" || exit 1
 
 	# Cleanup, just incase the incoming directory was not pre-cleaned
 	${MAKE:-make} distclean >/dev/null 2>/dev/null
 
+	# Create VFS directory
+	mkdir "starpack.vfs"
+	mkdir "starpack.vfs/lib"
+
+	## Copy in all built directories
+	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
+
+	## Rename the "vfs" package directory to what "boot.tcl" expects
+	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
+
+	## Install "boot.tcl"
+	cp 'boot.tcl' 'starpack.vfs/'
+
 	# Figure out if zlib compiled (if not, the system zlib will be used and we
 	# will need to have that present)
 	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
 	export ZLIBDIR
 	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
@@ -79,23 +92,10 @@
 	${MAKE:-make} || exit 1
 
 	# Strip the kit of all symbols, if possible
 	"${STRIP:-strip}" kit >/dev/null 2>/dev/null
 
-	# Create VFS directory
-	mkdir "starpack.vfs"
-	mkdir "starpack.vfs/lib"
-
-	## Copy in all built directories
-	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
-
-	## Rename the "vfs" package directory to what "boot.tcl" expects
-	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
-
-	## Install "boot.tcl"
-	cp 'boot.tcl' 'starpack.vfs/'
-
 	# Intall VFS onto kit
 	## Determine if we have a Tclkit to do this work
 	TCLKIT="${TCLKIT:-tclkit}"
 	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
 		## Install using existing Tclkit

Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4
==================================================================
--- kitsh/buildsrc/kitsh-0.0/aclocal.m4
+++ kitsh/buildsrc/kitsh-0.0/aclocal.m4
@@ -187,10 +187,11 @@
 
 	AC_SUBST(ARCHS)
 ])
 
 AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
+	AC_CANONICAL_BUILD
 	AC_CANONICAL_HOST
   
 	AC_MSG_CHECKING(host operating system)
 	AC_MSG_RESULT($host_os)
   
@@ -317,11 +318,13 @@
 
   AC_MSG_RESULT($SHOBJLDFLAGS $SHOBJFLAGS)
 ])
 
 AC_DEFUN(DC_CHK_OS_INFO, [
+	AC_CANONICAL_BUILD
 	AC_CANONICAL_HOST
+
 	AC_SUBST(SHOBJEXT)
 	AC_SUBST(AREXT)
         AC_SUBST(SHOBJFLAGS)
         AC_SUBST(SHOBJLDFLAGS)
 

Index: kitsh/buildsrc/kitsh-0.0/configure.ac
==================================================================
--- kitsh/buildsrc/kitsh-0.0/configure.ac
+++ kitsh/buildsrc/kitsh-0.0/configure.ac
@@ -30,11 +30,11 @@
 
 dnl Find the appropriate libraries to link to
 AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
 AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
 
-if test "x$TARGET" = "tclkit"; then
+if test "$TARGET" = "tclkit"; then
 	dnl Figure out how to statically link to libgcc, if needed
 	DC_STATIC_LIBGCC
 else
 	dnl We have KitDLL
 
@@ -98,11 +98,11 @@
 	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
 	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
 ])
 
 dnl Only needed for Tclkit
-if test "x$TARGET" = "tclkit"; then
+if test "$TARGET" = "tclkit"; then
 	DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
 		DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
 			AC_SEARCH_LIBS(inflate, z zlib,, [
 				AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
 			])
@@ -151,11 +151,11 @@
 	esac
 ])
 AC_MSG_RESULT([$storage_mech])
 
 dnl Verify sanity of storage mechanism
-if ! test "x$TARGET" = "tclkit"; then
+if ! test "$TARGET" = "tclkit"; then
 	case "$storage_mech" in
 		auto|cvfs)
 			true
 			;;
 		*)