Merge pull request #63 in DNS/adguard-dns from hotfix to master
* commit 'ae9964c445e200d22b159a47bfc6c00af990653e': Makefile -- fix build failure on systems where /bin/sh is not alias to /bin/bash
This commit is contained in:
commit
945bd24f67
2
Makefile
2
Makefile
|
@ -20,7 +20,7 @@ $(STATIC): client/node_modules
|
||||||
|
|
||||||
AdguardDNS: $(STATIC) *.go
|
AdguardDNS: $(STATIC) *.go
|
||||||
mkdir -p $(GOPATH)/src/github.com/AdguardTeam
|
mkdir -p $(GOPATH)/src/github.com/AdguardTeam
|
||||||
if [[ ! -h $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS ]]; then rm -rf $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS && ln -fs ../../../../.. $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS; fi
|
if [ ! -h $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS ]; then rm -rf $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS && ln -fs ../../../../.. $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS; fi
|
||||||
GOPATH=$(GOPATH) go get -v -d .
|
GOPATH=$(GOPATH) go get -v -d .
|
||||||
GOPATH=$(GOPATH) GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) go get -v github.com/gobuffalo/packr/...
|
GOPATH=$(GOPATH) GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) go get -v github.com/gobuffalo/packr/...
|
||||||
mkdir -p $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS/build/static ## work around packr bug
|
mkdir -p $(GOPATH)/src/github.com/AdguardTeam/AdguardDNS/build/static ## work around packr bug
|
||||||
|
|
Loading…
Reference in New Issue