diff options
| author | mdejong <mdejong> | 2005-07-25 01:33:50 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2005-07-25 01:33:50 (GMT) |
| commit | 4acbabe60fcb27871141aa191ac778f523243c4b (patch) | |
| tree | 72ba278e783d250dc396b309ae2af942e7d5b6b1 /win/Makefile.in | |
| parent | 4ae82e332a39743b7d9a3df7e514069bda33a3a9 (diff) | |
| download | tk-4acbabe60fcb27871141aa191ac778f523243c4b.zip tk-4acbabe60fcb27871141aa191ac778f523243c4b.tar.gz tk-4acbabe60fcb27871141aa191ac778f523243c4b.tar.bz2 | |
* unix/Makefile.in: Subst TCLSH_PROG and
BUILD_TCLSH into Makefile. Rework html
target so that it depends on the tclsh
installed on the system PATH.
* unix/configure: Regen.
* unix/configure.in: Invoke SC_PROG_TCLSH
and SC_BUILD_TCLSH and subst into Makefile.
* unix/tcl.m4: Update from Tcl.
* win/Makefile.in: Subst TCLSH_PROG and
BUILD_TCLSH into Makefile. Rework winhelp
target so that it depends on the tclsh
installed on the system PATH.
* win/configure: Regen.
* win/configure.in: Invoke SC_BUILD_TCLSH
and subst into Makefile.
* win/tcl.m4: Update from Tcl.
[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 8527a75..fe3ab8e 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.59 2003/01/13 07:30:58 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59.2.1 2005/07/25 01:33:54 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -189,14 +189,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}" \ @@ -362,10 +362,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/ |