Change path to Xerces library files

[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 65cec84..6c0672d 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -16,10 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include ..\Versions.wxi ?>
-<?define Xerces32Component='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}' ?>
-<?define Xerces32Componentd='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}' ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
     <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'
@@ -32,19 +28,19 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\VC10\Release\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\VC10\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>
                 <File KeyPath='yes' Name='XERCES.LICENSE'
-                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />
+                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\LICENSE' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->