diff options
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 18cb549..1348949 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.106 2005/07/05 20:56:50 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.107 2005/08/23 18:25:34 mdejong Exp $ # Current Tk version; used in various names. @@ -187,6 +187,21 @@ NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED # 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 @@ -200,13 +215,6 @@ INSTALL_PROGRAM = ${INSTALL} 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. @@ -1473,13 +1481,10 @@ html-tk: @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 # # Targets to build Solaris package of the distribution for the current |