Update for install-html

diff --git a/Makefile.am b/Makefile.am
index d87bd414d1766f962c552396cfae98a6c3c3ad07..95d97653ef5b9f150f745d287f52074d3207dff0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,6 +138,7 @@ maintainer-clean-local:
        -rm -f m4/ltversion.m4
        -rm -f m4/lt~obsolete.m4
        -rmdir build-aux
+       -rm -rf ${top_builddir}/html
 
 install-website: html-local
        -rm -r -f /var/www/libmemcached/*

diff --git a/docs/include.am b/docs/include.am
index d4b8140d9d9f253152ccc4647571516157b4f527..b302681d5ba7aaa0c68d2c9c6c61e301d276b425 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -5,27 +5,25 @@
 # Makefile for Sphinx documentation
 #
 
-SPHINXOPTS    = ${SPHINX_WARNINGS}
+SPHINXOPTS    = ${SPHINX_WARNINGS} -q
 PAPER         =
-SPHINX_BUILDDIR      = ${top_builddir}/docs
+SPHINX_BUILDDIR      = ${abs_top_builddir}/docs
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   =  $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SPHINX_BUILDDIR)
+ALLSPHINXOPTS   = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SPHINX_BUILDDIR)
 
 .PHONY: clean-docs-check
 clean-docs-check:
        -rm -rf docs/_build docs/doctrees man/.doctrees/
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
 if HAVE_SPHINX
 
 sphinx-help:
        @echo "Please use \`make <target>' where <target> is one of"
        @echo "  html       to make standalone HTML files"
-       @echo "  dirhtml    to make HTML files named index.html in directories"
        @echo "  singlehtml to make a single large HTML file"
        @echo "  pickle     to make pickle files"
        @echo "  json       to make JSON files"
@@ -41,23 +39,15 @@ sphinx-help:
        @echo "  linkcheck  to check all external links for integrity"
        @echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
-docs/_static: 
-       @$(mkdir_p) docs/_static
-
-html-local: docs/conf.py docs changes docs/_static
-       PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html
-       @echo
-       @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
+install-html-local: html-local
+       @$(MKDIR_P)  $(htmldir)/html
+       @cp -r ${top_builddir}/html $(htmldir)/
 
-dirhtml: html-local
-       PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
-       @echo
-       @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
+html-local: docs/conf.py
+       @PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ${top_builddir}/html
 
 singlehtml: html-local
-       PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
-       @echo
-       @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
+       @PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
 
 pickle: docs/conf.py
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
@@ -75,24 +65,6 @@ htmlhelp: docs/conf.py
        @echo "Build finished; now you can run HTML Help Workshop with the" \
              ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."
 
-qthelp: docs/conf.py
-       PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/qthelp
-       @echo
-       @echo "Build finished; now you can run "qcollectiongenerator" with the" \
-             ".qhcp project file in $(SPHINX_BUILDDIR)/qthelp, like this:"
-       @echo "# qcollectiongenerator $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhcp"
-       @echo "To view the help file:"
-       @echo "# assistant -collectionFile $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhc"
-
-devhelp: docs/conf.py
-       PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/devhelp
-       @echo
-       @echo "Build finished."
-       @echo "To view the help file:"
-       @echo "# mkdir -p $$HOME/.local/share/devhelp/Libmemcached"
-       @echo "# ln -s $(SPHINX_BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Libmemcached"
-       @echo "# devhelp"
-
 epub: docs/conf.py
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
        @echo
@@ -112,13 +84,11 @@ latexpdf: latex
        @echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."
 
 text: docs/conf.py
-       PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
-       @echo
-       @echo "Build finished. The text files are in $(SPHINX_BUILDDIR)/text."
+       @PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
 
 if HAVE_RECENT_SPHINX
 man:
-       PYTHONPATH=$(SPHINX_BUILDDIR)/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
+       @PYTHONPATH=$(SPHINX_BUILDDIR)/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_builddir}/man
 
 else
 
@@ -127,15 +97,10 @@ man:
 endif
 
 changes: docs/conf.py
-       PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
-       @echo
-       @echo "The overview file is in $(SPHINX_BUILDDIR)/changes."
+       @PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
 
 linkcheck: docs/conf.py
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
-       @echo
-       @echo "Link check complete; look for any errors in the above output " \
-             "or in $(SPHINX_BUILDDIR)/linkcheck/output.txt."
 
 doctest: docs/conf.py
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest