From 5f3bf6ddebc850a99d2c1fe4c4599f6d794acc7c Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 7 Feb 2017 15:25:04 +0000
Subject: [PATCH] Correct OpenSSL case

---
 src/setup/win32/Include.wxi |  4 ++--
 src/setup/win32/Product.wxs | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
index cce465a0..22e42077 100644
--- a/src/setup/win32/Include.wxi
+++ b/src/setup/win32/Include.wxi
@@ -14,14 +14,14 @@
     <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
     <?define PlatformSimpleName="64-bit" ?>
     <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
-    <?define var.OpensslPath="openssl/win64" ?>
+    <?define var.OpenSSLPath="openssl/win64" ?>
     <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
     <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
     <?else ?>
     <?define ProgramFilesFolder="ProgramFilesFolder" ?>
     <?define PlatformSimpleName="32-bit" ?>
     <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
-    <?define var.OpensslPath="openssl/win32" ?>
+    <?define var.OpenSSLPath="openssl/win32" ?>
     <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
     <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
     <?endif ?>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index bf2b066d..458dde50 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -12,7 +12,7 @@
 		</Upgrade>
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSslComponents"/>
+			<ComponentGroupRef Id="OpenSSLComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<MergeRef Id="CRT"/>
 			<ComponentRef Id="RegistryEntries"/>
@@ -49,7 +49,7 @@
 			<Directory Id="$(var.ProgramFilesFolder)">
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
 					<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
-					<Directory Id="OpenSslDir" Name="OpenSSL"/>
+					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
 				</Directory>
 			</Directory>
@@ -92,11 +92,11 @@
 				<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
 			</Component>
 		</ComponentGroup>
-		<ComponentGroup Directory="OpenSslDir" Id="OpenSslComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSsl">
-				<File Id="OpenSslDll1" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll"/>
-				<File Id="OpenSslDll2" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll"/>
-				<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe"/>
+		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
+			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
+				<File Id="OpenSSLDll1" Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/libeay32.dll"/>
+				<File Id="OpenSSLDll2" Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/ssleay32.dll"/>
+				<File Source="$(var.ExtPath)/$(var.OpenSSLPath)/bin/openssl.exe"/>
 				<File Source="$(var.ResPath)/openssl/synergy.conf"/>
 			</Component>
 		</ComponentGroup>