Cleanups and adjustments

[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 95cbdf9..cd07b8b 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -45,14 +45,13 @@
                   <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
-                  <File Id='openssl.exe_debug' Name='openssl.exe' />\r
+                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
               <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
-                <File KeyPath='yes' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />\r
               </Component>\r
             </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_sp -->\r