diff options
| author | hobbs <hobbs@noemail.net> | 2005-12-01 02:13:32 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2005-12-01 02:13:32 (GMT) |
| commit | dcf12dea3c6e423649b63e3dde96599292d1aa05 (patch) | |
| tree | 6d475c5caba4ff0aecb8df9ce58e07ab24483971 | |
| parent | cf4b2c41a4b5337ebf59afacf3e1a3fd22f2498a (diff) | |
| download | tk-dcf12dea3c6e423649b63e3dde96599292d1aa05.zip tk-dcf12dea3c6e423649b63e3dde96599292d1aa05.tar.gz tk-dcf12dea3c6e423649b63e3dde96599292d1aa05.tar.bz2 | |
* win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to
get Tcl built dll first.
FossilOrigin-Name: 11205be794d6e8cd84366f846527b1c60ce3fa9d
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | win/Makefile.in | 10 |
2 files changed, 8 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2005-11-30 Jeff Hobbs <jeffh@ActiveState.com> + * win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to + get Tcl built dll first. + * tests/scrollbar.test (6.22): fix rounding-error sensitive test * tests/textWind.test: use "Courier -12" on all platforms. diff --git a/win/Makefile.in b/win/Makefile.in index c346c5a..3f6473c 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.2.2 2005/11/30 00:19:01 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59.2.3 2005/12/01 02:13:33 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -377,14 +377,14 @@ $(MAN2TCL): $(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c test: binaries $(TKTEST) @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; \ + PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \ ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \ | ./$(CAT32) runtest: binaries $(TKTEST) @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; \ + PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \ ./$(TKTEST) $(TESTFLAGS) $(SCRIPT) # This target can be used to run wish from the build directory @@ -392,14 +392,14 @@ runtest: binaries $(TKTEST) shell: binaries @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; \ + PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \ ./$(WISH) $(SCRIPT) # This target can be used to run wish inside either gdb or insight gdb: binaries @echo "set env TCL_LIBRARY=$(TCL_SRC_DIR_NATIVE)/library" > gdb.run @echo "set env TK_LIBRARY=$(ROOT_DIR_NATIVE)/library" >> gdb.run - PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \ + PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \ gdb ./$(WISH) --command=gdb.run @$(RM) gdb.run |