summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2021-05-17 04:25:11 -0500
committerGitHub <noreply@github.com>2021-05-17 04:25:11 -0500
commita9b7625151c60f549c20def8ef11985101e03d01 (patch)
tree474cff79e067bbececa9020915a0978fbae3dc17
parentdd7118c4337424766abd3d73dec9fa934c40501a (diff)
downloadansible-a9b7625151c60f549c20def8ef11985101e03d01.tar.gz
Makefile: Allow one to specify python version (#74517) (#74528)
Change: - Allow overriding python version as env var for Makefile - Including hacking directory in git export, for docs build Test Plan: - Tested as part of recent downstream work Co-authored-by: Yanis Guenane <yguenane@gmail.com>
-rw-r--r--.gitattributes1
-rw-r--r--Makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 7d5be40ba5..b87b24305e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
.github/ export-ignore
-hacking/ export-ignore
diff --git a/Makefile b/Makefile
index aff3d89423..7fb44ba1e6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ else
ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
endif
-PYTHON=python
+PYTHON ?= python
GENERATE_CLI = hacking/build-ansible.py generate-man
# fetch version from project release.py as single source-of-truth