[master] bb44c36 Fix build with newer sphinx versions

[Federico G. Schwindt]

commit bb44c36c21fdebe0e84134b2945274708d996ea8
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sat Jan 7 19:44:22 2017 +0000

    Fix build with newer sphinx versions

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 5923186..6968535 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -7,7 +7,7 @@ SPHINXBUILD   = sphinx-build -W -q -N
 PAPER         = a4
 BUILDDIR      = build
 
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees -D latex_paper_size=$(PAPER) $(SPHINXOPTS) $(builddir)
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees -D latex_elements.papersize=$(PAPER) $(SPHINXOPTS) $(builddir)
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
diff --git a/doc/sphinx/Makefile.phk b/doc/sphinx/Makefile.phk
index 57689bd..f04a711 100644
--- a/doc/sphinx/Makefile.phk
+++ b/doc/sphinx/Makefile.phk
@@ -8,8 +8,8 @@ PAPER         =
 BUILDDIR      = build
 
 # Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
+PAPEROPT_a4     = -D latex_elements.papersize=a4
+PAPEROPT_letter = -D latex_elements.papersize=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(CURDIR)
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest