diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | unix/Makefile.in | 14 | ||||
| -rw-r--r-- | win/Makefile.in | 10 |
3 files changed, 29 insertions, 2 deletions
@@ -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 wish + from the build directory. + +2001-06-26 Mo DeJong <mdejong@redhat.com> + * win/configure: * win/configure.in: Revert cross compiling change accidently added during last checkin. diff --git a/unix/Makefile.in b/unix/Makefile.in index 489738e..0719826 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.51 2001/06/22 23:59:48 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.52 2001/06/27 02:06:13 mdejong Exp $ # Current Tk version; used in various names. @@ -454,6 +454,18 @@ runtest: tktest TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \ ./tktest +# This target can be used to run wish from the build directory +# via `make shell` or `make shell SCRIPT=/tmp/foo.tcl` +shell: wish + LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \ + export LD_LIBRARY_PATH; \ + LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \ + SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \ + export SHLIB_PATH; \ + TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \ + TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \ + ./wish $(SCRIPT) + install: all install-binaries install-libraries install-demos install-doc # Note: before running ranlib below, must cd to target directory because diff --git a/win/Makefile.in b/win/Makefile.in index 0a240d2..b0e3531 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.37 2001/06/22 23:59:48 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.38 2001/06/27 02:06:13 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -398,6 +398,14 @@ runtest: tktest PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \ ./$(TKTEST) +# This target can be used to run wish from the build directory +# via `make shell` or `make shell SCRIPT=foo.tcl` +shell: $(WISH) + @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; \ + ./$(WISH) $(SCRIPT) + install: all install-binaries install-libraries install-doc install-demos install-binaries: binaries |