https://issues.shibboleth.net/jira/browse/SSPCPP-506

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

diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 2942c06..b9ffaf4 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -17,6 +17,10 @@
    permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
+<?define LibEay32Component='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}' ?>\r
+<?define SSlEay32Component='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}' ?>\r
+<?define LibEay32Componentd='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}' ?>\r
+<?define SSlEay32Componentd='{A9583DF6-F075-4F43-991C-3611B31036DF}' ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
@@ -28,20 +32,20 @@
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_sp' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
-              <Component Id='libeay32.dll' Guid='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}'>\r
+              <Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>\r
                 <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
-              <Component Id='ssleay32.dll' Guid='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}'>\r
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>\r
                 <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
                 <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
-                <Component Id='libeay32D.dll' Guid='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}'>\r
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>\r
                   <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='ssleay32D.dll' Guid='{A9583DF6-F075-4F43-991C-3611B31036DF}'>\r
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>\r
                   <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r