diff options
| author | mdejong <mdejong> | 2001-11-25 05:22:19 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-11-25 05:22:19 (GMT) |
| commit | e95ab711f748cf56cc3d25728ef32841c6de9b67 (patch) | |
| tree | 52daa1c7ebcc6b77dd06a74ac52ff5e7e352ef1d /win | |
| parent | c3778545e13e2216951950fec35c2283d7ac01b4 (diff) | |
| download | tcl-e95ab711f748cf56cc3d25728ef32841c6de9b67.zip tcl-e95ab711f748cf56cc3d25728ef32841c6de9b67.tar.gz tcl-e95ab711f748cf56cc3d25728ef32841c6de9b67.tar.bz2 | |
* unix/Makefile.in: Add comments to better describe
TCL_EXE and when it should be available.
* win/Makefile.in: Add TCL_EXE variable to be used
by rules like `make genstubs`. Don't set TCL_LIBRARY
before running `make genstubs` since we will be running
with a tclsh from the PATH not the one we build.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 127f9df..80dcb28 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.57 2001/11/11 03:16:10 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.58 2001/11/25 05:22:19 mdejong Exp $ VERSION = @TCL_VERSION@ @@ -128,6 +128,13 @@ SHARED_LIBRARIES = $(TCL_DLL_FILE) $(TCL_STUB_LIB_FILE) \ $(DDE_DLL_FILE) $(REG_DLL_FILE) $(PIPE_DLL_FILE) STATIC_LIBRARIES = $(TCL_LIB_FILE) $(REG_LIB_FILE) $(DDE_LIB_FILE) +# 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 + TCLSH = tclsh$(VER)${EXESUFFIX} TCLTEST = tcltest${EXEEXT} CAT32 = cat32$(EXEEXT) @@ -581,8 +588,7 @@ $(GENERIC_DIR)/tclStubInit.c: $(GENERIC_DIR)/tcl.decls \ @echo "Warning: run \"make genstubs\" to regenerate tclStubInit.c" genstubs: - @TCL_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TCL_LIBRARY; \ - $(TCLSH) "$(ROOT_DIR_NATIVE)\tools\genStubs.tcl" \ + $(TCL_EXE) "$(ROOT_DIR_NATIVE)\tools\genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ "$(GENERIC_DIR_NATIVE)\tcl.decls" \ "$(GENERIC_DIR_NATIVE)\tclInt.decls" |