From 1e60791d1c973221f948fe86a55ebb7426c79307 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 4 Jun 2018 12:03:54 +0200
Subject: [PATCH] drop windows env var workaround

---
 mea.pro | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/mea.pro b/mea.pro
index 9be1fca8..5d7badf5 100644
--- a/mea.pro
+++ b/mea.pro
@@ -14,24 +14,22 @@ withtests: {
 # Use QtCreator to create a release build, make sure to *disable* shadow build.
 # After building, run "make wininstaller"
 wininstaller.depends = mea
-BR=$$BRANDING
-equals(BR, "") {
+equals(BRANDING, "") {
     APP_NAME = mea
     PACKAGE_DIR = packaging\windows
     PACKAGE_NAME = mea-win-installer
 } else {
-    APP_NAME = $${BR}
-    PACKAGE_NAME = $${BR}-win-installer
+    APP_NAME = $${BRANDING}
+    PACKAGE_NAME = $${BRANDING}-win-installer
     PACKAGE_DIR = packaging\windows_$${APP_NAME}
 }
 wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data & mkdir $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
 wininstaller.commands += copy $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\logo.ico $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\logo.ico &&
 wininstaller.commands += copy mea\release\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe &&
-SSLL=$$SSL_LIBS
-!equals(SSLL, "") {
-message("Deploying SSL libs from $${SSLL} to package.")
-wininstaller.commands += copy $${SSLL}\libeay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
-wininstaller.commands += copy $${SSLL}\ssleay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
+!equals(SSL_LIBS, "") {
+message("Deploying SSL libs from $${SSL_LIBS} to package.")
+wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
+wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
 }
 wininstaller.commands += windeployqt --compiler-runtime --qmldir mea\ui $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\ &&
 wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME}