diff options
| author | mdejong <mdejong> | 2005-08-23 18:25:33 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2005-08-23 18:25:33 (GMT) |
| commit | 7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4 (patch) | |
| tree | c59af7d24b600d7bcd3d9bbfb76f2d99b309fdab /win/Makefile.in | |
| parent | 6c3967704d759e1cf47471002f6e0a8d574f22e5 (diff) | |
| download | tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.zip tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.tar.gz tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.tar.bz2 | |
* unix/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
* unix/configure: Regen.
* unix/configure.in: Update minimum autoconf version
to 2.59. Invoke SC_PROG_TCLSH and SC_BUILD_TCLSH.
* unix/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
* win/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
* win/configure: Regen.
* win/configure.in: Update minimum autoconf version
to 2.59. Invoke SC_BUILD_TCLSH.
* win/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
Split confused search for tclsh on PATH and
build and install locations into two macros.
SC_PROG_TCLSH searches just the PATH.
SC_BUILD_TCLSH determines the name of the tclsh
executable in the Tcl build directory.
[Tcl bug 1160114]
[Tcl patch 1244153]
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 277a99a..5986853 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.62 2004/07/20 10:23:51 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.63 2005/08/23 18:25:34 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -198,14 +198,14 @@ SHELL = @SHELL@ 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}" \ @@ -372,10 +372,7 @@ $(ROOT_DIR)/doc/man.macros: 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/ |