summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/developer/Makefile3
-rw-r--r--doc/user/Makefile3
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index 056b78e68e..e04e17d380 100644
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -9,6 +9,9 @@ BUILDDIR = _build
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+SPHINXBUILD = sphinx-1.0-build
+endif
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif
diff --git a/doc/user/Makefile b/doc/user/Makefile
index 056b78e68e..e04e17d380 100644
--- a/doc/user/Makefile
+++ b/doc/user/Makefile
@@ -9,6 +9,9 @@ BUILDDIR = _build
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+SPHINXBUILD = sphinx-1.0-build
+endif
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif