Merge pull request #8830 from zhijianli88/GOBIN

Makefile: check and use GOBIN environment variable first

Makefile

@@ -5,9 +5,12 @@ TARGETS     := darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/pp
 TARGET_OBJS ?= darwin-amd64.tar.gz darwin-amd64.tar.gz.sha256 darwin-amd64.tar.gz.sha256sum linux-amd64.tar.gz linux-amd64.tar.gz.sha256 linux-amd64.tar.gz.sha256sum linux-386.tar.gz linux-386.tar.gz.sha256 linux-386.tar.gz.sha256sum linux-arm.tar.gz linux-arm.tar.gz.sha256 linux-arm.tar.gz.sha256sum linux-arm64.tar.gz linux-arm64.tar.gz.sha256 linux-arm64.tar.gz.sha256sum linux-ppc64le.tar.gz linux-ppc64le.tar.gz.sha256 linux-ppc64le.tar.gz.sha256sum linux-s390x.tar.gz linux-s390x.tar.gz.sha256 linux-s390x.tar.gz.sha256sum windows-amd64.zip windows-amd64.zip.sha256 windows-amd64.zip.sha256sum
 BINNAME     ?= helm
 
-GOPATH        = $(shell go env GOPATH)
-GOX           = $(GOPATH)/bin/gox
-GOIMPORTS     = $(GOPATH)/bin/goimports
+GOBIN         = $(shell go env GOBIN)
+ifeq ($(GOBIN),)
+GOBIN         = $(shell go env GOPATH)/bin
+endif
+GOX           = $(GOBIN)/gox
+GOIMPORTS     = $(GOBIN)/goimports
 ARCH          = $(shell uname -p)
 
 ACCEPTANCE_DIR:=../acceptance-testing