Tkinter, step 5: remove lib-tk subdirectory and update all places where it was mentioned.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a57224a..f951256 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -910,14 +910,14 @@
print("WARNING: _ctypes.pyd not found, ctypes will not be included")
extensions.remove("_ctypes.pyd")
- # Add all .py files in Lib, except lib-tk, test
+ # Add all .py files in Lib, except tkinter, test
dirs={}
pydirs = [(root,"Lib")]
while pydirs:
parent, dir = pydirs.pop()
if dir == ".svn" or dir.startswith("plat-"):
continue
- elif dir in ["lib-tk", "idlelib", "Icons"]:
+ elif dir in ["tkinter", "idlelib", "Icons"]:
if not have_tcl:
continue
tcltk.set_current()
@@ -1186,7 +1186,7 @@
("InstallGroup", -1, prefix+r"\InstallPath\InstallGroup", "",
"Python %s" % short_version, "REGISTRY"),
("PythonPath", -1, prefix+r"\PythonPath", "",
- r"[TARGETDIR]Lib;[TARGETDIR]DLLs;[TARGETDIR]Lib\lib-tk", "REGISTRY"),
+ r"[TARGETDIR]Lib;[TARGETDIR]DLLs", "REGISTRY"),
("Documentation", -1, prefix+r"\Help\Main Python Documentation", "",
"[TARGETDIR]Doc\\"+docfile , "REGISTRY.doc"),
("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"),