opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-03 03:07:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

use $GO env-var instead of hard-coded go binary

Browse Source 
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

Closes: #817
Approved by: TomSweeneyRedHat
This commit is contained in:
Lokesh Mandvekar
2018-05-21 15:06:28 +00:00
committed by Atomic Bot
parent 390bd16d37
commit 687b165a73
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -25,7 +25,7 @@ BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d
SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z) SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/projectatomic/libpod/vendor | grep -v e2e) PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/projectatomic/libpod/vendor | grep -v e2e)
COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
@ -43,7 +43,7 @@ FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH)))
GOPKGDIR := $(FIRST_GOPATH)/src/$(PROJECT) GOPKGDIR := $(FIRST_GOPATH)/src/$(PROJECT)
GOPKGBASEDIR ?= $(shell dirname "$(GOPKGDIR)") GOPKGBASEDIR ?= $(shell dirname "$(GOPKGDIR)")
GOBIN := $(shell go env GOBIN) GOBIN := $(shell $(GO) env GOBIN)
ifeq ($(GOBIN),) ifeq ($(GOBIN),)
GOBIN := $(FIRST_GOPATH)/bin GOBIN := $(FIRST_GOPATH)/bin
endif endif
@ -234,21 +234,21 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
.install.gitvalidation: .gopathok .install.gitvalidation: .gopathok
if [ ! -x "$(GOBIN)/git-validation" ]; then \ if [ ! -x "$(GOBIN)/git-validation" ]; then \
go get -u github.com/vbatts/git-validation; \ $(GO) get -u github.com/vbatts/git-validation; \
fi fi
.install.gometalinter: .gopathok .install.gometalinter: .gopathok
if [ ! -x "$(GOBIN)/gometalinter" ]; then \ if [ ! -x "$(GOBIN)/gometalinter" ]; then \
go get -u github.com/alecthomas/gometalinter; \ $(GO) get -u github.com/alecthomas/gometalinter; \
cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \ cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \
git checkout 23261fa046586808612c61da7a81d75a658e0814; \ git checkout 23261fa046586808612c61da7a81d75a658e0814; \
go install github.com/alecthomas/gometalinter; \ $(GO) install github.com/alecthomas/gometalinter; \
$(GOBIN)/gometalinter --install; \ $(GOBIN)/gometalinter --install; \
fi fi
.install.md2man: .gopathok .install.md2man: .gopathok
if [ ! -x "$(GOBIN)/go-md2man" ]; then \ if [ ! -x "$(GOBIN)/go-md2man" ]; then \
go get -u github.com/cpuguy83/go-md2man; \ $(GO) get -u github.com/cpuguy83/go-md2man; \
fi fi
.install.ostree: .gopathok .install.ostree: .gopathok