Fixed doc generation for Python package

diff --git a/Makefile.am b/Makefile.am
index ef7642aaa4a2ca8788b845a2619c4df2c6454999..81e79686481d14a0e277f1ab01ea35202d904d0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ ACLOCAL_AMFLAGS = -I salome_adm/unix/config_files
 if WITHONLYLAUNCHER
   SUBDIRS = src resources
 else
-  SUBDIRS = salome_adm $(IDLDIR) src doc bin resources
+  SUBDIRS = salome_adm $(IDLDIR) src bin doc resources
 endif
 
 DIST_SUBDIRS= salome_adm idl src doc bin resources

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 1168cba51eca43e8efd0bf4379a574d9d98439e0..56246adab831a2115b9dff88aac98c0514f3130c 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -28,7 +28,6 @@ pydocdir = $(docdir)/tui/KERNEL/docutils
 
 if SPHINX_IS_OK
 
-pydoc_DATA=html/index.html
 html/index.html:$(RSTFILES)
        make htm
 
@@ -42,7 +41,7 @@ SPHINXBUILD     = sphinx-build
 PAPEROPT_a4     = -D latex_paper_size=a4
 ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
 
-SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages
+SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/bin/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages
 
 SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib
 
@@ -50,7 +49,7 @@ htm:
        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."
 
@@ -58,7 +57,7 @@ latex:
        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" \
@@ -78,7 +77,7 @@ EXTRA_DIST+= $(RSTFILES)
 EXTRA_DIST+= \
        conf.py 
 
-install-data-local:
+install-data-local: html/index.html
        $(INSTALL) -d $(pydocdir)
        if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
        cp -rf $$b"html"/* $(pydocdir) ; \