]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
docs: Fix installation of man pages with Sphinx 4.x
authorDamien Goutte-Gattat <dgouttegattat@incenp.org>
Mon, 3 May 2021 16:14:22 +0000 (17:14 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 3 Jun 2021 15:43:25 +0000 (16:43 +0100)
The 4.x branch of Sphinx introduces a breaking change, as generated man
pages are now written to subdirectories corresponding to the manual
section they belong to. This results in `make install` erroring out when
attempting to install the man pages, because they are not where it
expects to find them.

This patch restores the behavior of Sphinx 3.x regarding man pages.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/256
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Message-id: 20210503161422.15028-1-dgouttegattat@incenp.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
docs/conf.py

index 00cf66ab54653b076aef94fe42659a644f73b54b..42729e22bbe21ff9d987800edf012d46b8c6880c 100644 (file)
@@ -279,6 +279,7 @@ man_pages = [
      ['Stefan Hajnoczi <stefanha@redhat.com>',
       'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1),
 ]
+man_make_section_directory = False
 
 # -- Options for Texinfo output -------------------------------------------