[Python-checkins] r62395 - doctools/trunk/sphinx/quickstart.py

[georg.brandl]

Author: georg.brandl
Date: Sat Apr 19 19:52:13 2008
New Revision: 62395

Log:
Use new name for web builder in the Makefile too.


Modified:
   doctools/trunk/sphinx/quickstart.py

Modified: doctools/trunk/sphinx/quickstart.py
==============================================================================
--- doctools/trunk/sphinx/quickstart.py	(original)
+++ doctools/trunk/sphinx/quickstart.py	Sat Apr 19 19:52:13 2008
@@ -188,12 +188,12 @@
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d %(rbuilddir)s/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) %(rsrcdir)s
 
-.PHONY: help clean html web htmlhelp latex changes linkcheck
+.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
 
 help:
 \t at echo "Please use \\`make <target>' where <target> is one of"
 \t at echo "  html      to make standalone HTML files"
-\t at echo "  web       to make files usable by Sphinx.web"
+\t at echo "  pickle    to make pickle files (usable by e.g. sphinx-web)"
 \t at echo "  htmlhelp  to make HTML files and a HTML help project"
 \t at echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 \t at echo "  changes   to make an overview over all changed/added/deprecated items"
@@ -208,13 +208,15 @@
 \t at echo
 \t at echo "Build finished. The HTML pages are in %(rbuilddir)s/html."
 
-web:
-\tmkdir -p %(rbuilddir)s/web %(rbuilddir)s/doctrees
-\t$(SPHINXBUILD) -b web $(ALLSPHINXOPTS) %(rbuilddir)s/web
-\t at echo
-\t at echo "Build finished; now you can run"
-\t at echo "  python -m sphinx.web %(rbuilddir)s/web"
-\t at echo "to start the server."
+pickle:
+\tmkdir -p %(rbuilddir)s/pickle %(rbuilddir)s/doctrees
+\t$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) %(rbuilddir)s/pickle
+\t at echo
+\t at echo "Build finished; now you can process the pickle files or run"
+\t at echo "  sphinx-web %(rbuilddir)s/pickle"
+\t at echo "to start the sphinx-web server."
+
+web: pickle
 
 htmlhelp:
 \tmkdir -p %(rbuilddir)s/htmlhelp %(rbuilddir)s/doctrees