@@ -5,10 +5,15 @@
 	TCLVERS="$1"
 
 	shift
 fi
 export TCLVERS
+
+# Add packages implied by the additional arguments
+if [ -z "${KITCREATOR_PKGS}" ]; then
+	KITCREATOR_PKGS="tk itcl mk4tcl"
+fi
 
 mode="build"
 if [ "$1" = "clean" ]; then
 	shift
 
@@ -20,24 +25,23 @@
 	mode="distclean"
 fi
 
 if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
 	# List all additional packages here so that they get cleaned up
-	ADDPKGS="${ADDPKGS} thread"
+	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
 fi
 
 CONFIGUREEXTRA="$@"
 export CONFIGUREEXTRA
 
-# Add packages implied by the additional arguments
 if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then
-	ADDPKGS="${ADDPKGS} thread"
+	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
 fi
 
 failedpkgs=""
 buildfailed="0"
-for pkg in tcl tk itcl mk4tcl tclvfs zlib ${ADDPKGS} kitsh; do
+for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do
 	if [ "${mode}" = "distclean" ]; then
 		rm -rf "${pkg}/src"
 	fi
 
 	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then