Diff

Differences From Artifact [a2eba5fa07]:

To Artifact [0243109d66]:


    16     16   # Download source
    17     17   download_src
    18     18   
    19     19   # We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
    20     20   tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
    21     21   tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
    22     22   if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
    23         -	echo "Unable to find Tk 8.4 directory, please build Tk84 before Tkimg" >&2
           23  +	setup_tcl85
    24     24   
    25         -	exit 1
           25  +	tkdir="$(echo "$(pwd)/../Tk85/build"/tk*/${tcl_plat_build_dir})"
           26  +	if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
           27  +		echo "Unable to find Tk 8.4 or Tk 8.5 directory, please build Tk84 or Tk85 before Tkimg" >&2
           28  +
           29  +		exit 1
           30  +	fi
    26     31   fi
    27     32   
    28     33   # Determine installation root
    29     34   
    30     35   INSTROOT="$(pwd)/out"
    31     36   export INSTROOT
    32     37