@@ -34,11 +34,11 @@
 rm -rf 'build' 'out' 'inst'
 mkdir 'out' 'inst' || exit 1
 
 
 (
-	cp -r 'buildsrc' 'build'
+	cp -rp 'buildsrc' 'build'
 	cd "${BUILDDIR}" || exit 1
 
 	# Fix up archives that Tcl gets wrong
 	for archive in ../../../tcl/inst/lib/dde*/tcldde*.a ../../../tcl/inst/lib/reg*/tclreg*.a; do
 		if [ ! -f "${archive}" ]; then
@@ -113,11 +113,15 @@
 	# Cleanup
 	rm -f kit kit.exe tclsh tclsh.exe
 
 	# Determine if target is KitDLL or KitSH
 	if [ "${KITTARGET}" = "kitdll" ]; then
-		CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-kitdll"
+		if [ "${KITCREATOR_STATIC_KITDLL}" = '1' ]; then
+			CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-kitdll=static"
+		else
+			CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-kitdll"
+		fi
 	fi
 
 	# Compile Kit
 	if [ -z "${ZLIBDIR}" ]; then
 		echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
@@ -166,11 +170,11 @@
 		for chkkittarget in libtclkit*.*; do
 			if [ ! -f "${chkkittarget}" ]; then
 				continue
 			fi
 
-			if echo "${chkkittarget}" | egrep '\.(lib|def|a)$'; then
+			if echo "${chkkittarget}" | egrep '\..*\.(lib|def|a)$'; then
 				continue
 			fi
 
 			KITTARGET_NAME="./${chkkittarget}"