summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2019-09-12 19:22:58 (GMT)
committersebres <sebres@users.sourceforge.net>2019-09-12 19:22:58 (GMT)
commita57cd978a5741e7948c7a8676307ca11c8a9fddb (patch)
tree912b1fa0e489f533e5612ffc5c2009b199ef878e /library
parent5c782902a038db957c312ccea67a142d076cd414 (diff)
parent77286202dda7f636e31cc4623108de8b7471c25b (diff)
downloadtcl-a57cd978a5741e7948c7a8676307ca11c8a9fddb.zip
tcl-a57cd978a5741e7948c7a8676307ca11c8a9fddb.tar.gz
tcl-a57cd978a5741e7948c7a8676307ca11c8a9fddb.tar.bz2
merge 8.5 - windows: eliminate overwriting of WINDIR env-variable in VS-makefiles (used WIN_DIR now similar to "makefile.in");
init.tcl: windows helper prefer SystemRoot if available.
Diffstat (limited to 'library')
-rw-r--r--library/init.tcl4
1 files changed, 3 insertions, 1 deletions
diff --git a/library/init.tcl b/library/init.tcl
index 8952172..c5404b2 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -668,7 +668,9 @@ proc auto_execok name {
}
set path "[file dirname [info nameof]];.;"
- if {[info exists env(WINDIR)]} {
+ if {[info exists env(SystemRoot)]} {
+ set windir $env(SystemRoot)
+ } elseif {[info exists env(WINDIR)]} {
set windir $env(WINDIR)
}
if {[info exists windir]} {