- mako_layout isn't used, remove it

- to check for epub look at "builder"

diff --git a/doc/build/Makefile b/doc/build/Makefile
index 80d9796d417498f52d2d5bb99bf8618e51f58a9c..4de8f98b6206e779dadb35003d4f3fa4256c1b91 100644 (file)
--- a/doc/build/Makefile
+++ b/doc/build/Makefile
@@ -41,7 +41,7 @@ clean:
        -rm -rf $(BUILDDIR)/*
 
 html:
-       $(SPHINXBUILD) -b html -A mako_layout=html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+       $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
        @echo
        @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
@@ -51,7 +51,7 @@ gettext:
        @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
 
 dist-html:
-       $(SPHINXBUILD) -b html -A mako_layout=html $(ALLSPHINXOPTS) ..
+       $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ..
        @echo
        @echo "Build finished.  The HTML pages are in ../."
 
@@ -100,7 +100,7 @@ devhelp:
        @echo "# devhelp"
 
 epub:
-       $(SPHINXBUILD) -b epub -A mako_layout=epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+       $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
        @echo
        @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 

diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako
index 99ce9d753a1c4be6a528cd970928060a2a21ffb9..23e57129b50b01a73ae3da96bc63e902c6ad808e 100644 (file)
--- a/doc/build/templates/layout.mako
+++ b/doc/build/templates/layout.mako
@@ -32,7 +32,7 @@
 <%inherit file="${context['base']}"/>
 
 <%
-    if mako_layout == 'epub':
+    if builder == 'epub':
         next.body()
         return
 %>