Merge pull request #1575 from prometheus/fix-promu-path

Fix build for people without $GOPATH/bin in $PATH.
This commit is contained in:
Julius Volz 2016-04-22 18:33:37 +02:00
commit bf0897bea5

View file

@ -11,8 +11,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
GO := GO15VENDOREXPERIMENT=1 go GO := GO15VENDOREXPERIMENT=1 go
pkgs = $(shell $(GO) list ./... | grep -v /vendor/) PROMU := $(GOPATH)/bin/promu
pkgs = $(shell $(GO) list ./... | grep -v /vendor/)
PREFIX ?= $(shell pwd) PREFIX ?= $(shell pwd)
BIN_DIR ?= $(shell pwd) BIN_DIR ?= $(shell pwd)
@ -48,11 +49,11 @@ vet:
build: promu build: promu
@echo ">> building binaries" @echo ">> building binaries"
@promu build --prefix $(PREFIX) @$(PROMU) build --prefix $(PREFIX)
tarball: promu tarball: promu
@echo ">> building release tarball" @echo ">> building release tarball"
@promu tarball --prefix $(PREFIX) $(BIN_DIR) @$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR)
docker: docker:
@echo ">> building docker image" @echo ">> building docker image"