From 8f17659d43d7d8e722871584835c8125c5077eb1 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Wed, 8 Feb 2017 15:21:14 +0000
Subject: [PATCH] Fix OpenSSL binary paths in WiX

---
 src/setup/win32/Include.wxi.in |  1 +
 src/setup/win32/Product.wxs    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/setup/win32/Include.wxi.in b/src/setup/win32/Include.wxi.in
index a32a7831..f533d15b 100644
--- a/src/setup/win32/Include.wxi.in
+++ b/src/setup/win32/Include.wxi.in
@@ -21,5 +21,6 @@
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
+    <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
     <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
 </Include>
\ No newline at end of file
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index c70ae0aa..bd20c1af 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -70,8 +70,8 @@
 				<File Source="$(var.BinPath)/synergyc.exe"/>
 				<File Source="$(var.BinPath)/syntool.exe"/>
 				<File Source="$(var.BinPath)/synwinhk.dll"/>
-				<File Source="$(var.BinPath)/libeay32.dll"/>
-				<File Source="$(var.BinPath)/ssleay32.dll"/>
+				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
+				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
 				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
@@ -94,9 +94,9 @@
 		</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"/>
+				<File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
+				<File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
+				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
 				<File Source="$(var.ResPath)/openssl/synergy.conf"/>
 			</Component>
 		</ComponentGroup>