From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 7 Sep 2014 22:10:40 +0000 (-0400)
Subject: - mako_layout isn't used, remove it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f93a505b8dd0d01c791854a3b99e462cd534059;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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 80d9796d41..4de8f98b62 100644
--- 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 99ce9d753a..23e57129b5 100644
--- 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
 %>