summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2001-06-27 01:53:18 (GMT)
committermdejong <mdejong>2001-06-27 01:53:18 (GMT)
commit544207080e881b8c182ab52bd14cf6988a7e22d1 (patch)
tree8f62724c052c4b21e0996ff6f523b09144eba78a
parenteffafed363f9f283c32c0006ee0d244e84a57797 (diff)
downloadtcl-544207080e881b8c182ab52bd14cf6988a7e22d1.zip
tcl-544207080e881b8c182ab52bd14cf6988a7e22d1.tar.gz
tcl-544207080e881b8c182ab52bd14cf6988a7e22d1.tar.bz2
* unix/Makefile.in:
* win/Makefile.in: Add `make shell` target. This target will set the proper env vars before invoking tclsh from the build directory.
-rw-r--r--ChangeLog7
-rw-r--r--unix/Makefile.in11
-rw-r--r--win/Makefile.in8
3 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c9b70b5..803fb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-06-26 Mo DeJong <mdejong@redhat.com>
+ * unix/Makefile.in:
+ * win/Makefile.in: Add `make shell` target. This target
+ will set the proper env vars before invoking tclsh
+ from the build directory.
+
+2001-06-26 Mo DeJong <mdejong@redhat.com>
+
* win/Makefile.in: Use : to separate VPATH entries. This
works for both Cygwin builds and cross builds, the VPSEP
variable is simply unneeded complexity.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 21d2867..794a265 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.77 2001/06/22 23:02:52 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.78 2001/06/27 01:53:18 mdejong Exp $
VERSION = @TCL_VERSION@
@@ -464,6 +464,15 @@ runtest: tcltest
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
./tcltest
+# This target can be used to run tclsh from the build directory
+# via `make shell SCRIPT=/tmp/foo.tcl`
+shell: tclsh
+ @LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
+ LIBPATH=`pwd`:${LIBPATH}; export LIBPATH; \
+ SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \
+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
+ ./tclsh ${SCRIPT}
+
# The following target outputs the name of the top-level source directory
# for Tcl (it is used by Tk's configure script, for example). The
# .NO_PARALLEL line is needed to avoid problems under Sun's "pmake".
diff --git a/win/Makefile.in b/win/Makefile.in
index 0354bcb..1f9ee81 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.46 2001/06/27 01:06:12 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.47 2001/06/27 01:53:18 mdejong Exp $
VERSION = @TCL_VERSION@
@@ -540,6 +540,12 @@ runtest: tcltest
@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
./tcltest
+# This target can be used to run tclsh from the build directory
+# via `make shell SCRIPT=foo.tcl`
+shell: $(TCLSH)
+ @TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
+ ./$(TCLSH) ${SCRIPT}
+
depend:
Makefile: $(SRC_DIR)/Makefile.in