Buncha last-minute fixes

diff --git a/PCbuild/python16.wse b/PCbuild/python16.wse
index 760aab2db5a79ce63947c5e2196528e18b04c5b1..06a593e09a07ba0aa17029a63cdefe4bbfbf21f6 100644 (file)
--- a/PCbuild/python16.wse
+++ b/PCbuild/python16.wse
@@ -97,17 +97,6 @@ item: Set Variable
 end\r
 item: End Block\r
 end\r
-item: Remark\r
-  Text=Where system DLLs are installed (choose one of the following):\r
-end\r
-item: Set Variable\r
-  Variable=DLLDEST\r
-  Value=%MAINDIR%\r
-end\r
-remarked item: Set Variable\r
-  Variable=DLLDEST\r
-  Value=%SYS32%\r
-end\r
 item: Set Variable\r
   Variable=BACKUP\r
   Value=%MAINDIR%\BACKUP\r
@@ -650,6 +639,17 @@ item: End Block
 end\r
 item: Open/Close INSTALL.LOG\r
 end\r
+item: Remark\r
+  Text=Where system DLLs are installed (choose one of the following):\r
+end\r
+item: Set Variable\r
+  Variable=DLLDEST\r
+  Value=%MAINDIR%\r
+end\r
+remarked item: Set Variable\r
+  Variable=DLLDEST\r
+  Value=%SYS32%\r
+end\r
 item: Check Disk Space\r
   Component=COMPONENTS\r
 end\r
@@ -698,6 +698,11 @@ item: Install File
   Destination=%MAINDIR%\DLLs\mmap.pyd\r
   Flags=0000000000000010\r
 end\r
+item: Install File\r
+  Source=%_SRC_%\pcbuild\_sre.pyd\r
+  Destination=%MAINDIR%\DLLs\_sre.pyd\r
+  Flags=0000000000000010\r
+end\r
 item: Install File\r
   Source=%_SRC_%\pcbuild\python16.dll\r
   Destination=%DLLDEST%\python16.dll\r
@@ -744,7 +749,19 @@ end
 item: Install File\r
   Source=%_SRC_%\Lib\encodings\*.py\r
   Destination=%MAINDIR%\Lib\encodings\r
-  Description=Tkinter related library modules\r
+  Description=Unicode encoding tables\r
+  Flags=0000000000000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Lib\distutils\*.py\r
+  Destination=%MAINDIR%\Lib\distutils\r
+  Description=Distribution utility modules\r
+  Flags=0000000000000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Lib\distutils\command\*.py\r
+  Destination=%MAINDIR%\Lib\distutils\command\r
+  Description=Distribution utility modules\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
@@ -1122,7 +1139,7 @@ item: Set Variable
   Flags=00010100\r
 end\r
 item: Include Script\r
-  Pathname=C:\Program Files\WISE\include\uninstal.wse\r
+  Pathname=%_WISE_%\include\uninstal.wse\r
 end\r
 item: If/While Statement\r
   Variable=COMPONENTS\r
@@ -1234,17 +1251,17 @@ item: If/While Statement
   Flags=00001010\r
 end\r
 item: Install File\r
-  Source=D:\src\tcl8.3\bin\tcl83.dll\r
+  Source=%_SRC_%\..\tcl8.3\bin\tcl83.dll\r
   Destination=%MAINDIR%\tcl83.dll\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=D:\src\tcl8.3\bin\tk83.dll\r
+  Source=%_SRC_%\..\tcl8.3\bin\tk83.dll\r
   Destination=%MAINDIR%\tk83.dll\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=D:\src\tcl8.3\lib\*.*\r
+  Source=%_SRC_%\..\tcl8.3\lib\*.*\r
   Destination=%MAINDIR%\tcl\r
   Flags=0000000100000010\r
 end\r