Differences From Artifact [73621b259f]:

• Executable file tk/build.sh — part of check-in [a6a6c489dc] at 2011-10-03 15:31:35 on branch trunk — Updated to try to build Tk in the same sub-directory as Tcl first

  Updated Tcl to try to build in the macosx directory first on Darwin (user: rkeene, size: 6461) [annotate] [blame] [check-ins using]

To Artifact [228f428c97]:

• Executable file tk/build.sh — part of check-in [fb277571b4] at 2011-10-03 19:08:57 on branch trunk — Updated to not use broken pre-generated Makefiles with Tk (user: rkeene, size: 6541) [annotate] [blame] [check-ins using]

143
144
145
146
147
148
149



150
151
152
153
154
155
156

			dir="win"
		fi

		# Remove previous directory's "tkConfig.sh" if found
		rm -f 'tkConfig.sh'

		cd "${BUILDDIR}/${dir}" || exit 1




		if [ "${dir}" = "win" ]; then
			# Statically link Tk to Tclkit if we are compiling for
			# Windows
			STATICTK="1"

			if [ "${win64}" = "1" ]; then

>
>
>

143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159

			dir="win"
		fi

		# Remove previous directory's "tkConfig.sh" if found
		rm -f 'tkConfig.sh'

		cd "${BUILDDIR}/${dir}" || exit 1

		# Remove broken pre-generated Makfiles
		rm -f GNUmakefile Makefile makefile

		if [ "${dir}" = "win" ]; then
			# Statically link Tk to Tclkit if we are compiling for
			# Windows
			STATICTK="1"

			if [ "${win64}" = "1" ]; then