Index: itcl/build.sh
==================================================================
--- itcl/build.sh
+++ itcl/build.sh
@@ -33,17 +33,16 @@
 	cd 'build' || exit 1
 
 	gzip -dc "../${SRC}" | tar -xf -
 
 	cd "${BUILDDIR}" || exit 1
-	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
+	./configure --enable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
 
 	"${MAKE:-make}" || exit 1
 
 	"${MAKE:-make}" install
 
 	mkdir "${OUTDIR}/lib" || exit 1
 	cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/"
-	rm -f "${OUTDIR}/lib"/itcl*/*.a
 ) || exit 1
 
 exit 0

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -37,18 +37,26 @@
 		# Remove previous directory's "tkConfig.sh" if found
 		rm -f 'tkConfig.sh'
 
 		cd "${BUILDDIR}/${dir}" || exit 1
 
-		./configure --disable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
+		./configure --enable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
 
 		"${MAKE:-make}" || continue
 
 		"${MAKE:-make}" install
+
+		# Update pkgIndex to load libtk from the local directory rather
+		# than the parent directory
+		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
+			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
+			mv "${pkgIndex}.new" "${pkgIndex}"
+		done
 
 		mkdir "${OUTDIR}/lib" || exit 1
 		cp -r "${INSTDIR}/lib"/tk*/ "${OUTDIR}/lib/"
+		cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
 
 		break
 	done
 ) || exit 1