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

Fix build for people without $GOPATH/bin in $PATH.
jhermann · Apr 22, 2016 · bf0897b · bf0897b
2 parents b8b114a + 7735d0d
commit bf0897b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GO   := GO15VENDOREXPERIMENT=1 go
-pkgs  = $(shell $(GO) list ./... | grep -v /vendor/)
+GO    := GO15VENDOREXPERIMENT=1 go
+PROMU := $(GOPATH)/bin/promu
+pkgs   = $(shell $(GO) list ./... | grep -v /vendor/)
 
 PREFIX                  ?= $(shell pwd)
 BIN_DIR                 ?= $(shell pwd)
@@ -48,11 +49,11 @@ vet:
 
 build: promu
 	@echo ">> building binaries"
-	@promu build --prefix $(PREFIX)
+	@$(PROMU) build --prefix $(PREFIX)
 
 tarball: promu
 	@echo ">> building release tarball"
-	@promu tarball --prefix $(PREFIX) $(BIN_DIR)
+	@$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR)
 
 docker:
 	@echo ">> building docker image"