Skip to content

Commit

Permalink
doc: automake: Add support for sphinx 4.0.
Browse files Browse the repository at this point in the history
File layout for man pages in sphinx 4 by default changed [1] from:

  Documentation/_ref/man/page.section

 to:

  Documentation/_ref/man/section/page.section

Ajusting our build scripts so they will be able to locate files
in new places.  This fixes our CI build.

[1] sphinx-doc/sphinx#7996

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Aaron Conole <aconole@redhat.com>
  • Loading branch information
igsilya committed May 11, 2021
1 parent 4ab5524 commit 2a3d1f4
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Documentation/automake.mk
Expand Up @@ -217,8 +217,13 @@ install-man-rst: docs-check
$(extract_stem_and_section); \
echo " $(MKDIR_P) '$(DESTDIR)'\"$$mandir\""; \
$(MKDIR_P) '$(DESTDIR)'"$$mandir"; \
echo " $(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
$(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
if test -f $(SPHINXBUILDDIR)/man/$$stem.$$section; then \
filepath=$(SPHINXBUILDDIR)/man/$$stem.$$section; \
else \
filepath=$(SPHINXBUILDDIR)/man/$$section/$$stem.$$section; \
fi; \
echo " $(INSTALL_DATA) $$filepath '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
$(INSTALL_DATA) $$filepath '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
done
else
install-man-rst:
Expand Down

0 comments on commit 2a3d1f4

Please sign in to comment.