Updated for 2.5 fileset plus various cleanups

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Xerces-x86.wxs

diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 20a3202..5807820 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -27,15 +27,14 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_sp' Name='SP'>\r
-            \r
             <Directory Id='lib' Name='lib'>\r
               <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>\r
-                <File Id='xercesc.dll' KeyPath='yes'\r
+                <File KeyPath='yes' Checksum='yes'\r
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>\r
-                  <File Id='xercescD.dll' KeyPath='yes'\r
+                  <File KeyPath='yes' Checksum='yes'\r
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
@@ -52,5 +51,3 @@
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix>\r
-\r
-    \r