diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-29 17:30:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 17:30:41 -0500 |
| commit | 745fa4ac94c3ec99becd85f59d1b59c2c9765527 (patch) | |
| tree | 63f32aeeb816a637e9406217a4044ff91031cd31 /Makefile | |
| parent | b6336071101fe4f19a7826d16f0dd61394678853 (diff) | |
| parent | c1f05be4d7ac31c741a9ea542e284d731c6544a1 (diff) | |
| download | podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.gz podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.bz2 podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.zip | |
Merge pull request #9163 from mheon/backports_rc2
Backports for v3.0 RC2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 7 insertions, 15 deletions
@@ -86,7 +86,7 @@ PODMAN_SERVER_LOG ?= # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) -export GOPATH := $(CURDIR)/_output +export GOPATH := $(HOME)/go unexport GOBIN endif FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH))) @@ -98,6 +98,8 @@ ifeq ($(GOBIN),) GOBIN := $(FIRST_GOPATH)/bin endif +export PATH := $(PATH):$(GOBIN) + GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man') CROSS_BUILD_TARGETS := \ @@ -206,7 +208,7 @@ endif podman: bin/podman .PHONY: bin/podman-remote -bin/podman-remote: .gopathok .generate-bindings $(SOURCES) go.mod go.sum ## Build with podman on remote environment +bin/podman-remote: .gopathok $(SOURCES) go.mod go.sum ## Build with podman on remote environment $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "${REMOTETAGS}" -o $@ ./cmd/podman .PHONY: bin/podman-remote-static @@ -277,7 +279,6 @@ clean: ## Clean artifacts libpod/container_easyjson.go \ libpod/pod_easyjson.go \ .install.goimports \ - .generate-bindings \ docs/build make -C docs clean @@ -459,20 +460,11 @@ podman-remote-%-release: rm -f release.txt $(MAKE) podman-remote-release-$*.zip -BINDINGS_SOURCE = $(wildcard pkg/bindings/**/types.go) -.generate-bindings: $(BINDINGS_SOURCE) +.PHONY: generate-bindings +generate-bindings: ifneq ($(shell uname -s), Darwin) - for i in $(BINDINGS_SOURCE); do \ - dirname=$$(dirname $${i}); \ - shortname=$$(basename $${dirname}); \ - pushd $${dirname}>/dev/null; \ - echo $${dirname}; \ - echo $(GO) generate; \ - $(GO) generate; \ - popd > /dev/null; \ - done; + GO111MODULE=off $(GO) generate ./pkg/bindings/... ; endif - touch .generate-bindings .PHONY: docker-docs docker-docs: docs |