From 7e9ae43ae9a2f3728ea42b4ccffae8a1d93592a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jostein=20B=C3=B8=20Fl=C3=B8ystad?= Date: Mon, 15 Jul 2013 13:57:35 +0200 Subject: [PATCH 1/2] docs: Makefile respects variables from environment. --- doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 311ce3ca..beadac7d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,9 +2,9 @@ # # You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +PAPER ?= # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 From 8796262b0ba53516954d3b6978d81af18c226ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jostein=20B=C3=B8=20Fl=C3=B8ystad?= Date: Mon, 15 Jul 2013 14:01:10 +0200 Subject: [PATCH 2/2] doc: Allow specifying python binary. --- doc/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index beadac7d..a593aa56 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,6 +2,7 @@ # # You can set these variables from the command line. +PYTHON ?= python SPHINXOPTS ?= SPHINXBUILD ?= sphinx-build PAPER ?= @@ -36,14 +37,14 @@ clean: -find ./source/auto_examples/* -type f | grep -v blank | xargs rm -f api: @mkdir -p source/api - python tools/build_modref_templates.py + $(PYTHON) tools/build_modref_templates.py @echo "Build API docs...done." random_gallery: - @cd source && python random_gallery.py + @cd source && $(PYTHON) random_gallery.py coveragetable: - @cd source && python coverage_generator.py + @cd source && $(PYTHON) coverage_generator.py html: api coveragetable random_gallery $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DEST)/html @@ -120,10 +121,10 @@ doctest: "results in build/doctest/output.txt." gh-pages: - python gh-pages.py + $(PYTHON) gh-pages.py gitwash: - python tools/gitwash/gitwash_dumper.py source scikit-image \ + $(PYTHON) tools/gitwash/gitwash_dumper.py source scikit-image \ --project-url=http://scikit-image.org \ --project-ml-url=http://groups.google.com/group/scikit-image \ --repo-name=scikit-image \