From 25ebbdc372e6b5f1c4b4156669d5c045fe158372 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 11 Mar 2017 01:12:50 +0100 Subject: make build with non standard goroot possible --- src/daq/s5proxy/Makefile | 3 +++ src/hub/.gitignore | 1 + src/hub/Makefile | 3 +++ 3 files changed, 7 insertions(+) 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 := -- cgit v1.2.3