From: Quentin Young Date: Tue, 20 Feb 2018 17:29:30 +0000 (-0500) Subject: doc: fallback to sphinx-1.0-build X-Git-Tag: frr-5.0-dev~165^2~24 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=adaf2d624b2c7552acd3d0683cb4d1393f5dcae4;p=mirror%2Ffrr.git 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 --- 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