Add new tkinter dir to various locations where lib-tk shows up.

diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec
index d6d14d8d72f83c7b3daac7c69954adc57e6af12f..78833582085540d42edfece9bb6fd15eec1e55d6 100644 (file)
--- a/Misc/RPM/python-2.6.spec
+++ b/Misc/RPM/python-2.6.spec
@@ -377,6 +377,7 @@ rm -f mainpkg.files tools.files
 %files tkinter
 %defattr(-,root,root)
 %{__prefix}/%{libdirname}/python%{libvers}/lib-tk
+%{__prefix}/%{libdirname}/python%{libvers}/tkinter
 %{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so*
 %endif
 

diff --git a/PC/VS7.1/python.iss b/PC/VS7.1/python.iss
index 40365be56ff8dd1f2eeca68f6bddfa7d710a9fda..b5cd1d554e5573c19eac1158ca4619a0b48f0592 100644 (file)
--- a/PC/VS7.1/python.iss
+++ b/PC/VS7.1/python.iss
@@ -180,6 +180,7 @@ Source: Lib\lib-old\*.*; DestDir: {app}\Lib\lib-old; CopyMode: alwaysoverwrite;
 Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\test\*.*; DestDir: {app}\Lib\test; CopyMode: alwaysoverwrite; Components: test; Flags: recursesubdirs
+Source: Lib\tkinter\*.py; DestDir: {app}\Lib\tkinter; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs
 
 Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main
 
@@ -297,6 +298,9 @@ Name: {app}\Lib\lib-old; Type: dirifempty
 Name: {app}\Lib\lib-tk\*.pyc; Type: files
 Name: {app}\Lib\lib-tk\*.pyo; Type: files
 Name: {app}\Lib\lib-tk; Type: dirifempty
+Name: {app}\Lib\tkinter\*.pyc; Type: files
+Name: {app}\Lib\tkinter\*.pyo; Type: files
+Name: {app}\Lib\tkinter; Type: dirifempty
 Name: {app}\Lib\test\*.pyc; Type: files
 Name: {app}\Lib\test\*.pyo; Type: files
 Name: {app}\Lib\test; Type: dirifempty

diff --git a/PC/VS7.1/python20.wse b/PC/VS7.1/python20.wse
index fa11af4b3ed7e883f263a8a52562de9dd08cc8ff..8f9042753cacd9552a76c2d02dba06be21dbadd6 100644 (file)
--- a/PC/VS7.1/python20.wse
+++ b/PC/VS7.1/python20.wse
@@ -2047,6 +2047,14 @@ item: Install File
 end
 item: Remark
 end
+item: Install File
+  Source=..\lib\tkinter\*.py
+  Destination=%MAINDIR%\Lib\tkinter
+  Description=Tkinter related library modules
+  Flags=0000000000000010
+end
+item: Remark
+end
 item: Install File
   Source=..\lib\logging\*.py
   Destination=%MAINDIR%\Lib\logging

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 74f6c377e0c0959d99204eb87dcad3ab52ecd446..4b4b3c43af0deaefb9f9157196d0085228524f4f 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -916,7 +916,7 @@ def add_files(db):
         parent, dir = pydirs.pop()
         if dir == ".svn" or dir.startswith("plat-"):
             continue
-        elif dir in ["lib-tk", "idlelib", "Icons"]:
+        elif dir in ["lib-tk", "tkinter", "idlelib", "Icons"]:
             if not have_tcl:
                 continue
             tcltk.set_current()