Install the docs (with fewer rules).

Add descriptions for the system variables.

diff --git a/PCbuild/python16.wse b/PCbuild/python16.wse
index deb515a29fd767096a0e635fd7b5046844733b59..1ea98deddacc0c56eabfab2def3af8b9705d9e35 100644 (file)
--- a/PCbuild/python16.wse
+++ b/PCbuild/python16.wse
@@ -17,19 +17,21 @@ item: Global
   Patch Threshold=85\r
   Patch Memory=4000\r
   Variable Name1=_SYS_\r
+  Variable Description1=System directory\r
   Variable Default1=C:\WINNT\SYSTEM32\r
-  Variable Flags1=00001000\r
+  Variable Flags1=00001001\r
   Variable Name2=_WISE_\r
+  Variable Description2=WISE root directory\r
   Variable Default2=C:\Program Files\Wise\r
-  Variable Flags2=00001000\r
+  Variable Flags2=00001001\r
   Variable Name3=_SRC_\r
-  Variable Description3=Root of Python Build Tree\r
+  Variable Description3=Python source directory\r
   Variable Default3=D:\src\Python-1.6\r
   Variable Flags3=00001001\r
   Variable Name4=_DOC_\r
-  Variable Description4=HTML documentation tree\r
-  Variable Default4=C:\Windows\Desktop\pysrc\Python-1.6\html\r
-  Variable Flags4=00001000\r
+  Variable Description4=HTML documentation tree directory\r
+  Variable Default4=D:\src\Python-1.6\html\r
+  Variable Flags4=00001001\r
 end\r
 remarked item: Open/Close INSTALL.LOG\r
   Flags=00000001\r
@@ -856,53 +858,11 @@ item: If/While Statement
   Value=B\r
   Flags=00001010\r
 end\r
-remarked item: Install File\r
-  Source=%_DOC_%\index.html\r
-  Destination=%MAINDIR%\Doc\index.html\r
-  Description=Python Documentation Root (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\icons\*.*\r
-  Destination=%MAINDIR%\Doc\icons\r
-  Description=Python Documentation Icons\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\tut\*.*\r
-  Destination=%MAINDIR%\Doc\tut\r
-  Description=Python Tutorial (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\lib\*.*\r
-  Destination=%MAINDIR%\Doc\lib\r
-  Description=Python Library Reference (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\ext\*.*\r
-  Destination=%MAINDIR%\Doc\ext\r
-  Description=Python Extending and Embedding Manual (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\api\*.*\r
-  Destination=%MAINDIR%\Doc\api\r
-  Description=Python/C API Reference (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\ref\*.*\r
-  Destination=%MAINDIR%\Doc\ref\r
-  Description=Python Language Reference (HTML)\r
-  Flags=0000000000000010\r
-end\r
-remarked item: Install File\r
-  Source=%_DOC_%\doc\*.*\r
-  Destination=%MAINDIR%\Doc\doc\r
-  Description=Python Meta-Documentation (HTML)\r
-  Flags=0000000000000010\r
+item: Install File\r
+  Source=%_DOC_%\*.*\r
+  Destination=%MAINDIR%\Doc\r
+  Description=Python Documentation (HTML)\r
+  Flags=0000000100000010\r
 end\r
 item: End Block\r
 end\r
@@ -1130,7 +1090,7 @@ item: If/While Statement
   Value=B\r
   Flags=00001010\r
 end\r
-remarked item: Create Shortcut\r
+item: Create Shortcut\r
   Source=%MAINDIR%\Doc\index.html\r
   Destination=%GROUP%\Python Manuals.lnk\r
   Working Directory=%MAINDIR%\r