github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix environment variables for godep invocation.

pull/441/head
Julius Volz 2015-01-09 12:33:58 +01:00
parent f1c257845f
commit cc1f2b6cad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.INCLUDE
View File

@ -41,10 +41,10 @@ GOURL ?= http://golang.org/dl
GOROOT = $(BUILD_PATH)/root/go GOROOT = $(BUILD_PATH)/root/go
GOPATH = $(BUILD_PATH)/root/gopath GOPATH = $(BUILD_PATH)/root/gopath
GOCC = $(GOROOT)/bin/go GOCC = $(GOROOT)/bin/go
GODEP = $(GOPATH)/bin/godep
TMPDIR = /tmp TMPDIR = /tmp
GOENV = TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH) GOENV = TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH)
GO = $(GOENV) $(GOCC) GO = $(GOENV) $(GOCC)
GODEP = $(GOENV) $(GOPATH)/bin/godep
GOFMT = $(GOROOT)/bin/gofmt GOFMT = $(GOROOT)/bin/gofmt
UNAME := $(shell uname) UNAME := $(shell uname)
@ -53,7 +53,7 @@ FULL_GOPATH_BASE := $(GOPATH)/src/github.com/prometheus
export PREFIX=$(BUILD_PATH)/root export PREFIX=$(BUILD_PATH)/root
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(GOROOT)/bin:$(PATH)
export GO_TEST_FLAGS ?= -v -short export GO_TEST_FLAGS ?= -v -short