vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1588 from aaronlehmann/golint-godep-location

Browse source 
Makefile: don't look for golint and godep in specific places
This commit is contained in:
Olivier Gambier 2016-03-31 15:21:40 -07:00
commit ff6f38ccb6
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -31,11 +31,8 @@ GO15VENDOREXPERIMENT := 1
PKGS := $(shell go list -tags "${DOCKER_BUILDTAGS}" ./... | grep -v ^github.com/docker/distribution/vendor/) PKGS := $(shell go list -tags "${DOCKER_BUILDTAGS}" ./... | grep -v ^github.com/docker/distribution/vendor/)
# Resolving binary dependencies for specific targets # Resolving binary dependencies for specific targets
GOLINT_BIN := $(GOPATH)/bin/golint GOLINT := $(shell which golint || echo '')
GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '') GODEP := $(shell which godep || echo '')
GODEP_BIN := $(GOPATH)/bin/godep
GODEP := $(shell [ -x $(GODEP_BIN) ] && echo $(GODEP_BIN) || echo '')
${PREFIX}/bin/registry: $(wildcard **/*.go) ${PREFIX}/bin/registry: $(wildcard **/*.go)
@echo "+ $@" @echo "+ $@"