Attachment "tk_84.patch" to
ticket [1244153fff]
added by
mdejong
2005-07-25 08:32:28.
Index: unix/Makefile.in
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/Makefile.in,v
retrieving revision 1.87.2.11
diff -u -r1.87.2.11 Makefile.in
--- unix/Makefile.in 23 Jun 2005 06:00:29 -0000 1.87.2.11
+++ unix/Makefile.in 25 Jul 2005 01:28:44 -0000
@@ -186,6 +186,21 @@
# determine which shell to use for executing commands:
SHELL = /bin/sh
+# BUILD_TCLSH is the fully qualified path name of the tclsh shell
+# in the Tcl build directory. Test that need to be run in the
+# version of tclsh that we are building against should use this
+# path. Targets that need an installed tclsh should not depend
+# on this variable.
+
+BUILD_TCLSH = @BUILD_TCLSH@
+
+# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
+# running make for the first time. Certain build targets (make genstubs)
+# need it to be available on the PATH. This executable should *NOT* be
+# required just to do a normal build although it can be required to run
+# make dist. This variable is set to "" if no tclsh is available.
+TCL_EXE = @TCLSH_PROG@
+
# Tk used to let the configure script choose which program to use
# for installing, but there are just too many different versions of
# "install" around; better to use the install-sh script that comes
@@ -199,13 +214,6 @@
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
-# running make for the first time. Certain build targets (make genstubs)
-# need it to be available on the PATH. This executable should *NOT* be
-# required just to do a normal build although it can be required to run
-# make dist.
-TCL_EXE = tclsh
-
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
# The value of the symbol is normally set by the configure script.
@@ -1455,13 +1463,10 @@
@EXTRA_BUILD_HTML@
BUILD_HTML = \
- @if test -f $(TCL_BIN_DIR)/tclsh; then \
- @LD_LIBRARY_PATH_VAR@=$(TCL_BIN_DIR):$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
- TCLSH="$(TCL_BIN_DIR)/tclsh"; else \
- TCLSH="$(TCL_EXE)"; fi ;\
- $${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
- --srcdir=$(TOP_DIR)/..
+ @if test -f "$(TCL_EXE)"; then \
+ $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
+ --srcdir=$(TOP_DIR)/.. ; \
+ fi
#
# Target to create a Macintosh version of the distribution. This will
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/configure.in,v
retrieving revision 1.83.2.20
diff -u -r1.83.2.20 configure.in
--- unix/configure.in 18 Jun 2005 19:36:58 -0000 1.83.2.20
+++ unix/configure.in 25 Jul 2005 01:28:44 -0000
@@ -22,6 +22,9 @@
SC_PATH_TCLCONFIG
SC_LOAD_TCLCONFIG
+SC_PROG_TCLSH
+SC_BUILD_TCLSH
+
if test "${TCL_VERSION}" != "${TK_VERSION}"; then
AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
Index: win/Makefile.in
===================================================================
RCS file: /cvsroot/tktoolkit/tk/win/Makefile.in,v
retrieving revision 1.59
diff -u -r1.59 Makefile.in
--- win/Makefile.in 13 Jan 2003 07:30:58 -0000 1.59
+++ win/Makefile.in 25 Jul 2005 01:28:44 -0000
@@ -189,14 +189,14 @@
RM = rm -f
COPY = cp
-TCLSH_PROG = @TCLSH_PROG@
+BUILD_TCLSH = @BUILD_TCLSH@
# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist.
-TCL_EXE = tclsh
+TCL_EXE = @TCLSH_PROG@
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
@@ -362,10 +362,7 @@
doc: $(ROOT_DIR)/doc/man.macros
winhelp: $(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl $(MAN2TCL)
- TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \
- TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
- PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \
- $(TCLSH_PROG) "$(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl" tcl "$(VER)" $(CORE_DOCS)
+ $(TCL_EXE) "$(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl" tcl "$(VER)" $(CORE_DOCS)
$(COPY) "$(TCL_BIN_DIR)"/tcl.hpj ./
hcw /c /e tcl.hpj
$(COPY) ./tcl$(VER).cnt ./TCL$(VER).HLP "$(TCL_SRC_DIR_NATIVE)"/tools/
Index: win/configure.in
===================================================================
RCS file: /cvsroot/tktoolkit/tk/win/configure.in,v
retrieving revision 1.49.2.14
diff -u -r1.49.2.14 configure.in
--- win/configure.in 18 Jun 2005 19:36:59 -0000 1.49.2.14
+++ win/configure.in 25 Jul 2005 01:28:44 -0000
@@ -129,6 +129,7 @@
SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
SC_LOAD_TCLCONFIG
+SC_BUILD_TCLSH
SC_PROG_TCLSH
#------------------------------------------------------------------------
