[GRASS-SVN] r60767 - grass/trunk/man

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2014-06-09 05:57:06 -0700 (Mon, 09 Jun 2014)
New Revision: 60767

Modified:
   grass/trunk/man/Makefile
Log:
pygrass doc: check if executable is sphinx-build or sphinx-build2

Modified: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile	2014-06-09 09:49:19 UTC (rev 60766)
+++ grass/trunk/man/Makefile	2014-06-09 12:57:06 UTC (rev 60767)
@@ -29,18 +29,25 @@
 
 ALL_HTML := $(wildcard $(HTMLDIR)/*.*.html)
 
+ifneq (@(type sphinx-build2 > /dev/null),)
+SPHINXBUILD   = sphinx-build2
+endif
+ifneq (@(type sphinx-build > /dev/null),)
+SPHINXBUILD   = sphinx-build
+endif
+
 default: $(DSTFILES)
 	@echo "Generating HTML manual pages index (help system)..."
 	$(MAKE) $(INDICES)
 	$(call build,check)
 	$(MAKE) manpages
-	@(type sphinx-build > /dev/null && $(call run_pygrass_html) || (echo "WARNING: pygrass documentation not compiled because 'sphinx-build' software not installed (get from http://www.sphinx.org)") ; exit 0)
+	@(type $(SPHINXBUILD) > /dev/null && $(call run_pygrass_html) || (echo "WARNING: pygrass HTML documentation not compiled because 'sphinx-build' software not installed (get from http://www.sphinx.org)") ; exit 0)
 
 # This must be a separate target so that evaluation of $(MANPAGES)
 # is delayed until the indices have been generated
 manpages:
 	$(MAKE) $(MANPAGES)
-	@(type sphinx-build > /dev/null && $(call run_pygrass_man) || (echo "WARNING: pygrass documentation not compiled because 'sphinx-build' software not installed (get from http://www.sphinx.org)") ; exit 0)
+	@(type $(SPHINXBUILD) > /dev/null && $(call run_pygrass_man) || (echo "WARNING: pygrass MAN documentation not compiled because 'sphinx-build' software not installed (get from http://www.sphinx.org)") ; exit 0)
 
 .PHONY: manpages