Also point TK_LIBRARY to the appropriate directory.

Changed the landmark to tclIndex, which should occur in both.

diff --git a/Lib/lib-tk/FixTk.py b/Lib/lib-tk/FixTk.py
index 804c75f32d7f95bba219fb789556b03fadaddb7b..c0af29b542a4ffd25cede48ee78b326e631f8d5b 100644 (file)
--- 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