Merge from V6_2_BR 23/12/2010

[modules/smesh.git] / doc / docutils / Makefile.am

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 867fd0a30bbbd3ced5cc19c9a8b72010299f3a32..573f4a4f0b57801ca3329374080ea956d06046b2 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -47,7 +47,7 @@ htm:
        mkdir -p html doctrees
        PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
        LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-       $(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
+       $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html
        @echo
        @echo "Build finished. The HTML pages are in html."
 
@@ -55,7 +55,7 @@ latex:
        mkdir -p latex doctrees
        PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
        LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-       $(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
+       $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -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" \
@@ -71,9 +71,6 @@ RSTFILES= \
 
 EXTRA_DIST+= $(RSTFILES)
 
-EXTRA_DIST+= \
-       conf.py 
-
 install-data-local: html/index.html
        test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
        if test -d "html"; then b=; else b="$(srcdir)/"; fi; \