Adapt conf.py to new option names.
diff --git a/Doc/Makefile b/Doc/Makefile
index 8569ba0..ea62f00 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -7,16 +7,19 @@
PYTHON = python
SVNROOT = http://svn.python.org/projects
SPHINXOPTS =
+PAPER =
-ALLSPHINXOPTS = -b$(BUILDER) -dbuild/doctrees $(SPHINXOPTS) . build/$(BUILDER)
+ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \
+ $(SPHINXOPTS) . build/$(BUILDER)
.PHONY: help checkout update build html web htmlhelp clean
help:
@echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " web to make file usable by Sphinx.web"
+ @echo " html to make standalone HTML files"
+ @echo " web to make file usable by Sphinx.web"
@echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
checkout:
@if [ ! -d tools/sphinx ]; then \
@@ -60,6 +63,8 @@
latex: BUILDER = latex
latex: build
@echo "Build finished; the LaTeX files are in build/latex."
+ @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+ "run these through (pdf)latex."
clean:
-rm -rf build/*