From: gdd Date: Fri, 1 Oct 2010 15:04:20 +0000 (+0000) Subject: Patch for generation of documentation X-Git-Tag: V5_1_5a1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1c5f8ea198870b1cf264b395af14a4af04e8c0b0;p=modules%2Fgeom.git Patch for generation of documentation --- diff --git a/configure.ac b/configure.ac index e5cd6f127..dc4002b6a 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,9 @@ dnl Export the AR macro so that it will be placed in the libtool file dnl correctly. export AR +AC_PROG_MKDIR_P +AC_SUBST(MKDIR_P) + echo echo --------------------------------------------- echo testing make diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am index a85de6cef..28e175dc4 100644 --- a/doc/docutils/Makefile.am +++ b/doc/docutils/Makefile.am @@ -28,13 +28,12 @@ pydocdir = $(docdir)/tui/GEOM/docutils if SPHINX_IS_OK -pydoc_DATA=html/index.html html/index.html:$(RSTFILES) make htm endif -EXTRA_DIST+= html +EXTRA_DIST+= images SPHINXOPTS = SOURCEDIR = $(srcdir) @@ -47,25 +46,25 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$ SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib htm: - mkdir -p html doctrees + $(MKDIR_P) html doctrees PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \ LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \ - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html + $(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html @echo @echo "Build finished. The HTML pages are in html." latex: - mkdir -p latex doctrees + $(MKDIR_P) latex doctrees PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \ LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \ - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) latex + $(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex @echo @echo "Build finished; the LaTeX files are in latex." @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ "run these through (pdf)latex." html: - mkdir -p $@ + $(MKDIR_P) $@ RSTFILES= \ index.rst \ @@ -77,16 +76,18 @@ EXTRA_DIST+= $(RSTFILES) EXTRA_DIST+= \ conf.py -install-data-local: - $(INSTALL) -d $(pydocdir) +install-data-local: html/index.html + test -z $(pydocdir) || $(MKDIR_P) $(DESTDIR)$(pydocdir) if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ cp -rf $$b"html"/* $(pydocdir) ; \ if test -f $$b"latex"/geompy.pdf; then cp -f $$b"latex"/geompy.pdf $(pydocdir) ; fi; uninstall-local: - chmod -R +w $(pydocdir) - rm -rf $(pydocdir)/* + -test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/* clean-local: -rm -rf html latex doctrees if test -d "html"; then rm -rf html ; fi + +disthook : + -test -d html && cp -Rp html $(distdir)