summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2021-04-30 22:23:41 +0200
committerGitHub <noreply@github.com>2021-04-30 22:23:41 +0200
commit38fb05102c918d75f685d85569a32ee74468232c (patch)
treeb4c35ff9125f5ea47dc4bcd5cc2092928e269e49
parentFix BaseFileCacheModule#keys to respect prefix (#72789) (diff)
downloadansible-38fb05102c918d75f685d85569a32ee74468232c.tar.xz
ansible-38fb05102c918d75f685d85569a32ee74468232c.zip
Makefile: Allow one to specify python version (#74517)
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