[master] 06063ce Use one level less of indirection.

[Lasse Karstensen]

commit 06063ce9e7751643f6b4e235ef2441c30ef55601
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Mon Dec 21 14:29:06 2015 +0100

    Use one level less of indirection.
    
    Trips up my syntax highlighting.

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