summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-10-25 17:42:13 (GMT)
committerGuido van Rossum <guido@python.org>2000-10-25 17:42:13 (GMT)
commit1378bd5b0b148f771241dd09e5b9e10f6cb321d5 (patch)
tree5b3b3dc9f0a67e5e76239836c15fea0cc8e4c8bb
parent7497bd3e3dd0b68c3a215cfa7d8df4de8f55c6bd (diff)
downloadcpython-1378bd5b0b148f771241dd09e5b9e10f6cb321d5.zip
cpython-1378bd5b0b148f771241dd09e5b9e10f6cb321d5.tar.gz
cpython-1378bd5b0b148f771241dd09e5b9e10f6cb321d5.tar.bz2
Also point TK_LIBRARY to the appropriate directory.
Changed the landmark to tclIndex, which should occur in both.
-rw-r--r--Lib/lib-tk/FixTk.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/lib-tk/FixTk.py b/Lib/lib-tk/FixTk.py
index 804c75f..c0af29b 100644
--- a/Lib/lib-tk/FixTk.py
+++ b/Lib/lib-tk/FixTk.py
@@ -1,5 +1,6 @@
import sys, os, _tkinter
ver = str(_tkinter.TCL_VERSION)
-v = os.path.join(sys.prefix, "tcl", "tcl"+ver)
-if os.path.exists(os.path.join(v, "init.tcl")):
- os.environ["TCL_LIBRARY"] = v
+for t in "tcl", "tk":
+ v = os.path.join(sys.prefix, "tcl", t+ver)
+ if os.path.exists(os.path.join(v, "tclIndex")):
+ os.environ[t.upper() + "_LIBRARY"] = v