X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2FWiX%2FMergeModules%2FShibboleth-x86.wxs;h=05af6f57bd344da8d9a31be1008973175127a67a;hb=47fda4dab3c05875ee20b446a203a166bca8b9fa;hp=0686e951c8b24074dfe3d730c26eeff8ba8f8b82;hpb=99157d1520862840134a0c2353612207cac2d205;p=shibboleth%2Fcpp-sp.git

diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 0686e95..05af6f5 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -45,18 +45,12 @@
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
-            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>
-              <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
-                <File Name='CREDITS.txt' KeyPath='yes'/>
-                <File Name='LICENSE.txt' />
-                <File Name='NOTICE.txt' />
-                <File Name='README.txt'/>
-                <File Name='RELEASE.txt' />
-              </Component>
-            </Directory><!-- doc -->          </Directory><!-- shibboleth_sp -->
+            <Directory Id='doc' Name='doc'/>
+          </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
+    <?include OpenSAML-x86.wxi ?>
   </Module>
 </Wix>