Skip to content

Commit

Permalink
assign gobin if unset
Browse files Browse the repository at this point in the history
  • Loading branch information
schallert committed Apr 7, 2019
1 parent edaa213 commit 7d89595
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ DEP_VERSION := v0.5.0
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(SELF_DIR)/.ci/common.mk

SHELL=/bin/bash -o pipefail
GOPATH=$(shell eval $$(go env | grep GOPATH) && echo $$GOPATH)
SHELL = /bin/bash -o pipefail
GOPATH = $(shell eval $$(go env | grep GOPATH) && echo $$GOPATH)
GOBIN ?= $(GOPATH)/bin

define LICENSE_HEADER
Copyright (c) 2019 Uber Technologies, Inc.
Expand Down Expand Up @@ -45,11 +46,10 @@ metalint_check := .ci/metalint.sh
metalint_config := .metalinter.json
metalint_exclude := .excludemetalint
gopath_prefix := $(GOPATH)/src
gopath_bin_path := $(GOPATH)/bin
package_root := github.com/m3db/m3db-operator
package_path := $(gopath_prefix)/$(package_root)
retool_bin_path := $(package_path)/_tools/bin
combined_bin_paths := $(retool_bin_path):$(gopath_bin_path)
combined_bin_paths := $(retool_bin_path):$(GOBIN)
retool_package := github.com/twitchtv/retool
vendor_prefix := vendor
mockgen_package := github.com/golang/mock/mockgen
Expand Down

0 comments on commit 7d89595

Please sign in to comment.