21118: Calls arvados-server from GOPATH instead of assuming root home dir.

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ca5e79a18cff60bff655c6d3cdb9938494b5785..a5da3246e287d231bec2e1ab0557befca95de390 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 # redHat package file
 RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
+GOPATH=$(shell go env GOPATH)
 export WORKSPACE?=$(shell pwd)
 
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
@@ -66,10 +67,11 @@ arvados-server-install: check-arvados-directory
        cd $(ARVADOS_DIRECTORY)
        go mod download
        cd cmd/arvados-server
+       echo GOPATH is $(GOPATH)
        go install
        cd -
-       ls -l ~/go/bin/arvados-server
-       ~/go/bin/arvados-server install -type test
+       ls -l $(GOPATH)/bin/arvados-server
+       $(GOPATH)/bin/arvados-server install -type test
 
 yarn-install: arvados-server-install
        yarn install