* 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.

3 files changed, 24 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cfaa9be..636a7c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-11-24  Mo DeJong  <mdejong@users.sourceforge.net>
 
+	* 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.
+
+2001-11-24  Mo DeJong  <mdejong@users.sourceforge.net>
+
 	* win/configure: Regen.
 	* win/tcl.m4 (SC_CONFIG_CFLAGS): Add comctl32.lib
 	to wish link libs. This change was originally added
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 485e67e..61384b7 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.88 2001/11/23 01:39:56 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.89 2001/11/25 05:22:19 mdejong Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -174,11 +174,11 @@ INSTALL_PROGRAM		= ${INSTALL}
 INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL} -m 644
 
-# The following specifies which Tcl executable to use for make targets
-# below.  This can generally be 'tclsh', meaning all targets will work
-# once we have created the initial executable, but in some cases you
-# may want to use a target without having made tclsh on these sources
-# (like for make genstubs)
+# 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 symbols below provide support for dynamic loading and shared
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"