diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2017-03-11 01:12:50 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2017-03-11 01:12:50 +0100 |
| commit | 25ebbdc372e6b5f1c4b4156669d5c045fe158372 (patch) | |
| tree | 564f44dab2e1685646ff4b9b06f1e92217c76efc | |
| parent | added forwarding for piwik (diff) | |
make build with non standard goroot possible
| -rw-r--r-- | src/daq/s5proxy/Makefile | 3 | ||||
| -rw-r--r-- | src/hub/.gitignore | 1 | ||||
| -rw-r--r-- | src/hub/Makefile | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/daq/s5proxy/Makefile b/src/daq/s5proxy/Makefile index f737d2d..db0c259 100644 --- a/src/daq/s5proxy/Makefile +++ b/src/daq/s5proxy/Makefile @@ -32,6 +32,9 @@ curdir:= $(shell pwd) GOCMD := GOPATH=$(curdir) go +ifdef GOROOT +GOCMD := GOPATH=$(curdir) $(GOROOT)/bin/go +endif EXECUTEABLE := s5proxy diff --git a/src/hub/.gitignore b/src/hub/.gitignore index c22e47e..7adb71a 100644 --- a/src/hub/.gitignore +++ b/src/hub/.gitignore @@ -1,4 +1,5 @@ /src/github.com +/src/golang.org /bin /pkg *.a diff --git a/src/hub/Makefile b/src/hub/Makefile index 91e96cd..9868708 100644 --- a/src/hub/Makefile +++ b/src/hub/Makefile @@ -32,6 +32,9 @@ curdir:= $(shell pwd) GOCMD := GOPATH=$(curdir) go +ifdef GOROOT +GOCMD := GOPATH=$(curdir) $(GOROOT)/bin/go +endif #TESTFLAG := -test.v TESTFLAG := |