RF: more consistent use of PYTHON var in Makefiles

matthew-brett · matthew-brett · commit b55375320cfd · 2017-03-17T13:21:13.000-07:00
Use PYTHON environment variable to select Python binary.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Automating common tasks for NIPY development
 
-PYTHON = python
+PYTHON ?= python
 HTML_DIR = doc/build/html
 LATEX_DIR = doc/build/latex
 WWW_DIR = doc/dist
@@ -80,16 +80,16 @@ bdist-egg-tests:
 	$(PYTHON) -c 'from nisext.testers import bdist_egg_tests; bdist_egg_tests("nipy")'
 
 source-release: distclean
-	python -m compileall .
+	$(PYTHON) -m compileall .
 	make distclean
-	python setup.py sdist --formats=gztar,zip
+	$(PYTHON) setup.py sdist --formats=gztar,zip
 
 venv-tests:
 	# I use this for python2.5 because the sdist-tests target doesn't work
 	# (the tester routine uses a 2.6 feature)
 	make distclean
 	- rm -rf $(VIRTUAL_ENV)/lib/python$(PYVER)/site-packages/nipy
-	python setup.py install
+	$(PYTHON) setup.py install
 	cd .. && nosetests $(VIRTUAL_ENV)/lib/python$(PYVER)/site-packages/nipy
 
 tox-fresh:
diff --git a/doc/Makefile b/doc/Makefile
@@ -1,6 +1,7 @@
 # Makefile for Sphinx documentation
 #
 
+PYTHON ?= python
 DIST_DIR = dist
 
 # You can set these variables from the command line.
@@ -58,15 +59,15 @@ htmlonly:
 	@echo "Build finished. The HTML pages are in build/html."
 
 api:
-	python ../tools/build_modref_templates.py
+	$(PYTHON) ../tools/build_modref_templates.py
 	@echo "Build API docs finished."
 
 html: api htmlonly
 	-ln -s build manual
 	@echo "Build HTML and API finished."
 
 gitwash-update:
-	python ../tools/gitwash_dumper.py devel/guidelines nipy \
+	$(PYTHON) ../tools/gitwash_dumper.py devel/guidelines nipy \
 		--github-user=nipy \
 		--project-url=http://nipy.org/nipy \
 		--project-ml-url=https://mail.python.org/mailman/listinfo/neuroimaging
@@ -90,7 +91,7 @@ latex: api
 	mkdir -p build/latex build/doctrees
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
 	# Clear bug for longtable column output in sphinx
-	python ../tools/fix_longtable.py build/latex/nipy.tex
+	$(PYTHON) ../tools/fix_longtable.py build/latex/nipy.tex
 	@echo
 	@echo "Build finished; the LaTeX files are in build/latex."
 	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
