Merge XMLTooling* into OpenSAML. Shibboleth Merge modules now contains OpenSAML...

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Shibboleth-x64.wxs

diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index dac7a92..76e49a4 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -45,19 +45,14 @@
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
-              <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
-                <File Name='CREDITS.txt' KeyPath='yes'/>\r
-                <File Name='LICENSE.txt' />\r
-                <File Name='NOTICE.txt' />\r
-                <File Name='README.txt'/>\r
-                <File Name='RELEASE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
+            <Directory Id='doc' Name='doc' />\r
           </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
+      </Directory><!-- ProgramFiles64Folder -->\r
     </Directory><!-- TARGETDIR -->\r
+\r
+    <?include OpenSAML-x64.wxi ?>\r
+\r
   </Module>\r
 </Wix>\r
 \r