From 4cd6266222fd614e11f52ca2244157e7b714c8df Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Wed, 7 Aug 2019 23:42:17 +0200
Subject: [PATCH] [pkg] fixup symlink
---
Makefile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index bdfbcea6..b32aea6c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,14 @@ VERSION ?= $(shell git describe)
# go paths
GOPATH = $(shell go env GOPATH)
-SYSTRAY = "0xacab.org/leap/bitmask-vpn"
+SYSTRAY = 0xacab.org/leap/bitmask-vpn
GOSYSTRAY = ${GOPATH}/src/${SYSTRAY}
# detect OS, we use it for dependencies
UNAME = `uname`
-TEMPLATES = "branding/templates"
-SCRIPTS = "branding/scripts"
+TEMPLATES = branding/templates
+SCRIPTS = branding/scripts
all: icon locales build
@@ -47,12 +47,17 @@ dependsCygwin:
get:
-@mkdir -p ${GOPATH}/src/0xacab.org/leap
- -@ln -s `pwd` ${GOSYSTRAY}
+ifeq (,$(wildcard ${GOSYSTRAY}))
+else
+ @rm -rf ${GOSYSTRAY}
+endif
+ @ln -s `pwd` ${GOSYSTRAY}
@cd ${GOSYSTRAY} && go get -tags $(TAGS) ./...
@cd ${GOSYSTRAY} && go get -tags "$(TAGS) bitmaskd" ./...
+ @echo "Done with go get."
-# when we can depend on go 1.11 we don't need the get step anymore
+# when we can depend on go 1.11 we don't need the get step anymore
build: get $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path))) build_done
build_%:
--
GitLab