diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2019-08-07 23:42:17 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2019-08-07 23:42:17 +0200 |
| commit | 4cd6266222fd614e11f52ca2244157e7b714c8df (patch) | |
| tree | c7673b5747df1c83f4802461af792e1bf7bac1f3 | |
| parent | dbe330b8796ca9f403b5d5fe2133726ba504a803 (diff) | |
[pkg] fixup symlink
| -rw-r--r-- | Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -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_%: |