From 55bc4f862b31294433b01d238cb0652c12bae40c Mon Sep 17 00:00:00 2001 From: barate Date: Wed, 11 May 2011 08:43:50 +0000 Subject: [PATCH] Fixed bug in docutils: KERNEL installation failed when Sphinx was not found by configure --- doc/docutils/Makefile.am | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am index b8bee607e..e7734833f 100644 --- a/doc/docutils/Makefile.am +++ b/doc/docutils/Makefile.am @@ -24,16 +24,15 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am pydocdir = $(docdir)/tui/KERNEL/docutils -.PHONY : latex - -if SPHINX_IS_OK - -html/index.html:$(RSTFILES) - make htm - -endif +RSTFILES = \ + index.rst \ + overview.rst \ + docapi.rst \ + salomepypkg.rst \ + kernel.rst \ + parametric.rst -EXTRA_DIST = archives +EXTRA_DIST = archives $(RSTFILES) SPHINXOPTS = SOURCEDIR = $(srcdir) @@ -45,7 +44,12 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$ SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib -htm: + +.PHONY: latex + +if SPHINX_IS_OK + +html/index.html:$(RSTFILES) mkdir -p html doctrees PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \ @@ -53,6 +57,13 @@ htm: @echo @echo "Build finished. The HTML pages are in html." +else + +html/index.html: + @echo "Documentation for Python package not built. Sphinx was not present at configure time." + +endif + latex: mkdir -p latex doctrees PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ @@ -63,19 +74,6 @@ latex: @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ "run these through (pdf)latex." -html: - mkdir -p $@ - -RSTFILES= \ - index.rst \ - overview.rst \ - docapi.rst \ - salomepypkg.rst \ - kernel.rst \ - parametric.rst - -EXTRA_DIST+= $(RSTFILES) - install-data-local: html/index.html test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir) if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ @@ -89,5 +87,5 @@ clean-local: -rm -rf html latex doctrees if test -d "html"; then rm -rf html ; fi -disthook : +dist-hook: -test -d html && cp -Rp html $(distdir) -- 2.39.2