diff -ru debian_patched/unix/Makefile.in debian_patched_plus/unix/Makefile.in --- debian_patched/unix/Makefile.in 2010-08-18 07:24:06.861099376 +0000 +++ debian_patched_plus/unix/Makefile.in 2010-08-18 09:55:43.085742055 +0000 @@ -163,6 +163,15 @@ # normal build although it can be required to run make dist. TCL_EXE = tclsh +# When cross compiling use the pre-existing (host) tclsh +# rather than the just built (target) tclsh +cross_compiling = @cross_compiling@ +ifeq (${cross_compiling},yes) + TCLSH=$(TCL_EXE) +else + TCLSH=./tclsh +endif + # The symbols below provide support for dynamic loading and shared libraries. # See configure.in for a description of what the symbols mean. The values of # the symbols are normally set by the configure script. You shouldn't normally @@ -623,20 +632,20 @@ shell: tclsh @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - ./tclsh $(SCRIPT) + $(TCLSH) $(SCRIPT) # This target can be used to run tclsh inside either gdb or insight gdb: tclsh @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run - $(GDB) ./tclsh --command=gdb.run + $(GDB) $(TCLSH) --command=gdb.run rm gdb.run # This target can be used to run tclsh inside ddd ddd: tclsh @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run - $(DDD) -command=gdb.run ./tclsh + $(DDD) -command=gdb.run $(TCLSH) rm gdb.run VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v @@ -649,7 +658,7 @@ valgrindshell: tclsh @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - valgrind $(VALGRINDARGS) ./tclsh $(SCRIPT) + valgrind $(VALGRINDARGS) $(TCLSH) $(SCRIPT) # The following target outputs the name of the top-level source directory for # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL @@ -821,14 +830,14 @@ @echo "Installing time zone data" @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TCLSH) $(TOOL_DIR)/installData.tcl \ $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata install-msgs: tclsh @echo "Installing message catalogs" @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TCLSH) $(TOOL_DIR)/installData.tcl \ $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs install-doc: doc @@ -1768,7 +1777,7 @@ BUILD_HTML = \ @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ + $(TCLSH) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # diff -ru debian_patched/unix/configure debian_patched_plus/unix/configure --- debian_patched/unix/configure 2010-08-18 07:24:06.861099376 +0000 +++ debian_patched_plus/unix/configure 2010-08-18 09:47:02.805088210 +0000 @@ -19666,6 +19666,7 @@ s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@cross_compiling@,$cross_compiling,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t