diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-07 18:10:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-07 18:10:40 -0400 |
| commit | 77e6046ff01adf8d512cfde7e0284a9a3d186632 (patch) | |
| tree | adecccb7a52c88129de943eb31b6b7850c5860a8 | |
| parent | 56e14e2e2829cddde16c9cceaf9560c0306fee93 (diff) | |
| download | sqlalchemy-77e6046ff01adf8d512cfde7e0284a9a3d186632.tar.gz | |
- mako_layout isn't used, remove it
- to check for epub look at "builder"
| -rw-r--r-- | doc/build/Makefile | 6 | ||||
| -rw-r--r-- | doc/build/templates/layout.mako | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/Makefile b/doc/build/Makefile index 80d9796d4..4de8f98b6 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 99ce9d753..23e57129b 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 %> |