Diff

Differences From Artifact [a2eba5fa07]:

To Artifact [0243109d66]:


16
17
18
19
20
21
22
23
24




25

26
27
28
29
30
31
32
# Download source
download_src

# We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
	echo "Unable to find Tk 8.4 directory, please build Tk84 before Tkimg" >&2





	exit 1

fi

# Determine installation root

INSTROOT="$(pwd)/out"
export INSTROOT








|

>
>
>
>
|
>







16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
# Download source
download_src

# We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
	setup_tcl85

	tkdir="$(echo "$(pwd)/../Tk85/build"/tk*/${tcl_plat_build_dir})"
	if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
		echo "Unable to find Tk 8.4 or Tk 8.5 directory, please build Tk84 or Tk85 before Tkimg" >&2

		exit 1
	fi
fi

# Determine installation root

INSTROOT="$(pwd)/out"
export INSTROOT