leave out redist and readmes from win installdir

and make x64 merge modules optional

scp2/source/ooo/scpaction_ooo.scp

@@ -35,6 +35,7 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
 End
 #endif
 
+#ifndef WNT
 ScpAction scp_Copy_Readme_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, README);
@@ -50,6 +51,7 @@ ScpAction scp_Copy_Readme_Txt
     Subdir = "READMEs";
   #endif
 End
+#endif
 
 #if defined(WNT) && defined(_gcc3)
 #if defined(MINGW_GCCDLL)

scp2/source/ooo/vc_redist.scp

@@ -29,18 +29,6 @@
 
 #if defined(WITH_VC_REDIST)
 
-ScpAction scp_Copy_vcredist_x86
-    Copy = "vcredist_x86.exe";
-    Name = "vcredist_x86.exe";
-    Subdir = "redist";
-End
-
-ScpAction scp_Copy_vcredist_x64
-    Copy = "vcredist_x64.exe";
-    Name = "vcredist_x64.exe";
-    Subdir = "redist";
-End
-
 MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
     Feature = gm_Root;
     Name = "Microsoft_VC90_CRT_x86.msm";
@@ -53,6 +41,8 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
     RootDir = "TARGETDIR";
 End
 
+#if defined(BUILD_X64)
+
 MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
     Feature = gm_Root;
     Name = "Microsoft_VC90_CRT_x86_x64.msm";
@@ -66,3 +56,5 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
 End
 
 #endif
+
+#endif