summaryrefslogtreecommitdiffstats
path: root/Doc/Makefile
diff options
context:
space:
mode:
authorJean-François B <jfbu@free.fr>2019-09-09 21:52:03 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2019-09-09 21:52:03 (GMT)
commitb5381f669718aa19690f42f3b8bd88f03045b9d2 (patch)
treed2fe501bf141e17c68ba1f7e80f5637402688a72 /Doc/Makefile
parent55d12ce8b8d397dd4e376bb0d1c27b3cced0ef50 (diff)
downloadcpython-b5381f669718aa19690f42f3b8bd88f03045b9d2.zip
cpython-b5381f669718aa19690f42f3b8bd88f03045b9d2.tar.gz
cpython-b5381f669718aa19690f42f3b8bd88f03045b9d2.tar.bz2
bpo-34293: Fix PDF documentation paper size (GH-8585)
The "A4" pdfs were previously the wrong size due to a change in the options in Sphinx 1.5. See also sphinx-doc/sphinx#5235
Diffstat (limited to 'Doc/Makefile')
-rw-r--r--Doc/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 3bcd9f2..f06689f 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -13,7 +13,11 @@ SOURCES =
DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
SPHINXERRORHANDLING = -W
-ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \
+# Internal variables.
+PAPEROPT_a4 = -D latex_elements.papersize=a4paper
+PAPEROPT_letter = -D latex_elements.papersize=letterpaper
+
+ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees $(PAPEROPT_$(PAPER)) \
$(SPHINXOPTS) $(SPHINXERRORHANDLING) . build/$(BUILDER) $(SOURCES)
.PHONY: help build html htmlhelp latex text changes linkcheck \