From 6c3d1fc1f8125493c07e2cfb6bbec02c6c5c9728 Mon Sep 17 00:00:00 2001 From: Jonathan Villemaire-Krajden Date: Mon, 7 May 2018 16:04:09 +0200 Subject: Fix empty GOPATH behaviour in Makefile (#8724) --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f4b70fac..bff03b1ad 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ else endif # Golang Flags -GOPATH ?= $(GOPATH:):./vendor +GOPATH ?= $(shell go env GOPATH) GOFLAGS ?= $(GOFLAGS:) GO=go GO_LINKER_FLAGS ?= -ldflags \ @@ -198,9 +198,9 @@ stop-docker: ## Stops the docker containers for local development. fi @if [ $(shell docker ps -a | grep -ci mattermost-minio) -eq 1 ]; then \ - echo stopping mattermost-minio; \ - docker stop mattermost-minio > /dev/null; \ - fi + echo stopping mattermost-minio; \ + docker stop mattermost-minio > /dev/null; \ + fi @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \ echo stopping mattermost-elasticsearch; \ @@ -273,7 +273,7 @@ gofmt: ## Runs gofmt against all packages. store-mocks: ## Creates mock files. go get github.com/vektra/mockery/... - GOPATH=$(shell go env GOPATH) $(shell go env GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.' + $(GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.' update-jira-plugin: ## Updates Jira plugin. go get github.com/mattermost/go-bindata/... -- cgit v1.2.3-1-g7c22