From: Michał Kępień <michal@isc.org>
Date: Fri, 21 May 2021 08:29:02 +0000 (+0200)
Subject: Explicitly set "man_make_section_directory"
X-Git-Tag: v9.17.14~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ec83d1f638f6b61a33012f40d0b88a416e0841d;p=thirdparty%2Fbind9.git

Explicitly set "man_make_section_directory"

The default value of the "man_make_section_directory" Sphinx option was
changed in Sphinx 4.0.1, which broke building man pages in maintainer
mode as the shell code in doc/man/Makefile.am expects man pages to be
built in doc/man/_build/man/, not doc/man/_build/man/<section_number>/.
The aforementioned change in defaults was reverted in Sphinx 4.0.2, but
this issue should still be prevented from reoccurring in the future.
Ensure that by explicitly setting the "man_make_section_directory"
option to False.
---

diff --git a/doc/man/conf.py b/doc/man/conf.py
index b4ca747fbc0..04dd6d86e9e 100644
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -40,6 +40,10 @@ author = u'Internet Systems Consortium'
 
 # -- General configuration ---------------------------------------------------
 
+# Build man pages directly in _build/man/, not in _build/man/<section>/.
+# This is what the shell code in Makefile.am expects.
+man_make_section_directory = False
+
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.