doc: fallback to sphinx-1.0-build

Some platforms (actually just Centos6, again, of course) call
"sphinx-build" as "sphinx-1.0-build", and so to work around this
apparently useless name, fall back to sphinx-1.0-build when we can't
find sphinx-build before displaying an error message. I am not doing in
this the configure script because the sphinx makefiles are not Automake
files and the less Automake in tree the better.

Signed-off-by: Quentin Young <qlyoung@qlyoung.net>

diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index 056b78e68e103c5e2bfdba03a91ca9207b09b801..e04e17d3802a49406ec8e51498722a2cb31f08e8 100644 (file)
--- 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 056b78e68e103c5e2bfdba03a91ca9207b09b801..e04e17d3802a49406ec8e51498722a2cb31f08e8 100644 (file)
--- 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