From fde18e485ff7cbc7b2e33dade8e81136f06a5b60 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 8 Aug 2019 00:19:33 +0200
Subject: [pkg] remove vendor

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

(limited to 'branding/templates/makefile/Makefile')

diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index 5f28bf5..2eb7312 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -79,27 +79,28 @@ endif
 # -----------------------------------------------------------------------------
 
 pkg_snap:
+	-@mkdir -p ../../deploy
 	@echo "[+] building snap..."
 	snapcraft build
 	snapcraft snap
-	-@mkdir -p dist
-	@mv $(BINNAME)* dist/
+	@mv $(BINNAME)* ../../deploy
 
 pkg_deb:
 	echo "[+] building debian package version" ${DEB_VERSION}
+	-@mkdir -p ../../deploy
 	@if [ $(BUILD_RELEASE) = no ]; then\
 		dch -v $(VERSION) -M "debian package generated from the git repository" && echo "[!] BUILD_RELEASE=no, incrementing changelog";\
 	else\
 		echo "[!] BUILD_RELEASE";\
 	fi
-	mkdir -p build ../dist
+	@mkdir -p build 
 	# bitmask-vpn tar.gz should be placed in parent forlder after doing 'make prepare' with the
 	# bitmask-vpn topmost Makefile.
-	cp ../bitmask-vpn_$(VERSION).tgz build/$(BINNAME)_${DEB_VERSION}.orig.tar.gz
-	cd build && tar xzf $(BINNAME)_${DEB_VERSION}.orig.tar.gz && mv bitmask-vpn_${VERSION}-src ${BINNAME}_${DEB_VERSION}
-	cp -r debian/ build/$(BINNAME)_$(DEB_VERSION)/
-	cd build/$(BINNAME)_$(DEB_VERSION) && debuild -us -uc
-	cp build/*.deb ../dist/
+	@cp ../bitmask-vpn_$(VERSION).tgz build/$(BINNAME)_${DEB_VERSION}.orig.tar.gz
+	@cd build && tar xzf $(BINNAME)_${DEB_VERSION}.orig.tar.gz && mv bitmask-vpn_${VERSION}-src ${BINNAME}_${DEB_VERSION}
+	@cp -r debian/ build/$(BINNAME)_$(DEB_VERSION)/
+	@cd build/$(BINNAME)_$(DEB_VERSION) && debuild -us -uc
+	@cp build/*.deb ../../deploy
 
 # -----------------------------------------------------------------------------
 # Utils
-- 
cgit v1.2.3