Check-in [fb277571b4]
Overview
Comment:Updated to not use broken pre-generated Makefiles with Tk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fb277571b46f343d590abb9233ad83689bfdc8d9
User & Date: rkeene on 2011-10-03 19:08:57
Other Links: manifest | tags
Context
2011-10-03
19:26
Updated to warn if KitCreator is run and "pre.sh" has not been run check-in: 95c04d527f user: rkeene tags: trunk
19:08
Updated to not use broken pre-generated Makefiles with Tk check-in: fb277571b4 user: rkeene tags: trunk
19:04
Updated to not use broken pre-generated Makefiles check-in: e51ad4b533 user: rkeene tags: trunk
Changes

Modified tk/build.sh from [73621b259f] to [228f428c97].

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