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

svn_grass at osgeo.org svn_grass at osgeo.org
Fri May 23 03:43:26 PDT 2014


Author: lucadelu
Date: 2014-05-23 03:43:26 -0700 (Fri, 23 May 2014)
New Revision: 60442

Modified:
   grass/trunk/man/Makefile
Log:
pygrass doc: generate pygrass doc in the main grass documentation directory

Modified: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile	2014-05-23 08:40:37 UTC (rev 60441)
+++ grass/trunk/man/Makefile	2014-05-23 10:43:26 UTC (rev 60442)
@@ -34,11 +34,13 @@
 	$(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)
 
 # 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)
 
 .PHONY: manpages
 
@@ -60,6 +62,14 @@
 	$(PYTHON) ./build_keywords.py $(HTMLDIR)
 endef
 
+define run_pygrass_html
+$(MAKE) -C ../lib/python/pygrass/docs/ html
+endef
+
+define run_pygrass_man
+$(MAKE) -C ../lib/python/pygrass/docs/ man
+endef
+
 $(HTMLDIR)/topics.html: $(ALL_HTML)
 	$(call build_topics)
 	touch $@
@@ -92,3 +102,4 @@
 
 $(HTMLDIR)/grass_icon.png: grass_icon.png
 	$(INSTALL_DATA) $< $@
+



More information about the grass-commit mailing list