From 4bcd4ab264d784364e918b65fd1cc15ffb12680c Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Wed, 28 Aug 2019 01:35:25 +0200
Subject: [PATCH] [pkg] fix paths to binaries in darwin/windows

---
 branding/templates/makefile/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index 42b1482c..0a611a24 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -36,8 +36,8 @@ pkg_win: staging\nssm.exe staging\openvpn\openvpn.exe
 else
 pkg_win: staging/nssm.exe staging/openvpn/openvpn.exe
 	echo "[+] building windows"
-	cp ../bin/bitmask-vpn staging/bitmask-vpn.exe
-	cp ../bin/bitmask-helper staging/bitmask_helper.exe
+	cp ../bin/windows/bitmask-vpn staging/bitmask-vpn.exe
+	cp ../bin/windows/bitmask-helper staging/bitmask_helper.exe
 	makensis windows/$(APPNAME)-installer.nsi
 endif
 
@@ -51,8 +51,8 @@ sign_win:
 
 pkg_osx:
 	echo "[+] Building osx package..."
-	cp ../bin/bitmask-vpn dist/$(APPNAME).app/Contents/MacOS/
-	cp ../bin/bitmask-helper dist/$(APPNAME).app/Contents/MacOS/
+	cp ../bin/darwin/bitmask-vpn dist/$(APPNAME).app/Contents/MacOS/
+	cp ../bin/darwin/bitmask-helper dist/$(APPNAME).app/Contents/MacOS/
 	cp $(STAGING)/openvpn-osx dist/$(APPNAME).app/Contents/Resources/openvpn.leap
 ifeq ($(SYSTEM), Darwin)
 	osx/quickpkg --output dist/$(APPNAME)-$(VERSION)_unsigned.pkg --scripts osx/scripts/ dist/$(APPNAME).app/
-- 
GitLab