Merge branch 'fix-out-of-srcdir-sphinx-build' into 'master'

Fix building of documentation out of the source tree.

configure.ac

@@ -403,7 +403,6 @@ AC_CONFIG_FILES([Makefile
 		 src/dnssec/Makefile
 		 src/dnssec/tests/Makefile
 		 src/dnssec/utils/Makefile
-		 doc/conf_autotools.py
 		 ])
 
 AC_OUTPUT

doc/Makefile.am

@@ -24,8 +24,8 @@ EXTRA_DIST = \
 	logo.eps		\
 	logo.png
 
-SPHINXBUILDDIR = _build
-ALLSPHINXOPTS  = -n -D latex_paper_size=a4 $(SPHINXOPTS) .
+SPHINXBUILDDIR = $(builddir)/_build
+ALLSPHINXOPTS  = -c $(srcdir) -n -D latex_paper_size=a4 -D version="@VERSION@" -D today="@RELEASE_DATE@" -D release="@VERSION@" $(SPHINXOPTS) $(srcdir)
 
 .PHONY: html-local singlehtml pdf-local info-local man install-html-local install-singlehtml install-pdf-local install-info-local
 
@@ -104,7 +104,7 @@ endif
 
 man: $(MANPAGES)
 $(MANPAGES): $(MANPAGES_IN) ../configure.ac
-	$(SPHINXBUILD) -b man -D version="@VERSION@" -D today="@RELEASE_DATE@" -d $(SPHINXBUILDDIR)/doctrees-man $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/man
+	$(SPHINXBUILD) -b man -d $(SPHINXBUILDDIR)/doctrees-man $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/man
 	mkdir -p man
 	for f in $(SPHINXBUILDDIR)/man/*; do \
 	  sed -e '/^.TP$$/{n;s/^.B //}' "$$f" > "man/$$(basename $$f)"; \
@@ -120,4 +120,4 @@ endif # HAVE_SPHINXBUILD
 endif # HAVE_DOCS
 
 clean-local:
-	-rm -rf _build
+	-rm -rf $(SPHINXBUILDDIR)

doc/conf.py

@@ -20,9 +20,6 @@ sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
-# variables generated on './configure'
-from conf_autotools import version, release, today
-
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 

doc/conf_autotools.py.in

-# -*- coding: utf-8 -*-
-#
-# Sphinx options generated by autotools on './configure'.
-#
-
-# The short X.Y version.
-version = '@VERSION@'
-
-# The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-today = '@RELEASE_DATE@'