More WiX. Fragments and include files to allow us to build an x64 installer (not...

[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 c0a52fd..ee12b84 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -18,7 +18,7 @@
 <?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>\r
+  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
     <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
@@ -30,18 +30,18 @@
             <Directory Id='lib' Name='lib' \r
                        FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release'>\r
               <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>\r
-                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
               </Component>\r
               <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>\r
-                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' \r
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\r
                 <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>\r
-                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
                 </Component>\r
                 <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>\r
-                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r