Fixed bug in docutils: GEOM installation failed when Sphinx was not found by configure

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 8a744e38847aa3d16bf9581ac563e722a81b5874..8e5b4ac46fc00d66ebd872f53c052fd255233422 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -24,16 +24,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 pydocdir = $(docdir)/tui/GEOM/docutils
 
-.PHONY : latex
-
-if SPHINX_IS_OK
-
-html/index.html:$(RSTFILES)
-       make htm
-
-endif
+RSTFILES = \
+       index.rst \
+       overview.rst \
+       docapi.rst
 
-EXTRA_DIST+= images
+EXTRA_DIST = images $(RSTFILES)
 
 SPHINXOPTS      =
 SOURCEDIR       = $(srcdir)
@@ -45,7 +41,12 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
 
 SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(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 +54,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,16 +71,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
-
-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; \
@@ -86,5 +84,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)