summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-29 11:46:56 +0100
committerGitHub <noreply@github.com>2019-11-29 11:46:56 +0100
commit39b14405c303d9b587f3d3ddc5e7ab526aa5dcb7 (patch)
tree539aba0d42e2d36765470453b1a41b60fc5cc879
parent17646e9c7d714fcc70c60339b75ae7087d29c8eb (diff)
parent7262e545c844b412a263ea717c3f19ba39f110c1 (diff)
downloadpodman-39b14405c303d9b587f3d3ddc5e7ab526aa5dcb7.tar.gz
podman-39b14405c303d9b587f3d3ddc5e7ab526aa5dcb7.tar.bz2
podman-39b14405c303d9b587f3d3ddc5e7ab526aa5dcb7.zip
Merge pull request #4589 from ssbarnea/fix/build2
Detect Python executable in Makefile
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b3566cd1e..dd948fc8e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ BUILDTAGS ?= \
exclude_graphdriver_devicemapper \
seccomp \
varlink
+PYTHON ?= $(shell command -v python python3)
GO_BUILD=$(GO) build
# Go module support: set `-mod=vendor` to use the vendored sources
@@ -133,7 +134,7 @@ endef
export PRINT_HELP_PYSCRIPT
help:
- @python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
+ @$(PYTHON) -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
.gopathok:
ifeq ("$(wildcard $(GOPKGDIR))","")