summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-12-01 02:13:33 (GMT)
committerhobbs <hobbs>2005-12-01 02:13:33 (GMT)
commit3b97d2470329d86a677341a8fbbff24920fa47c5 (patch)
tree6d475c5caba4ff0aecb8df9ce58e07ab24483971
parentbd544bc92c129d0d2675b90ec0e130b4b0d389c7 (diff)
downloadtk-3b97d2470329d86a677341a8fbbff24920fa47c5.zip
tk-3b97d2470329d86a677341a8fbbff24920fa47c5.tar.gz
tk-3b97d2470329d86a677341a8fbbff24920fa47c5.tar.bz2
* win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to
get Tcl built dll first.
-rw-r--r--ChangeLog3
-rw-r--r--win/Makefile.in10
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b3e6220..921c384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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