diff options
| author | Ilya Maximets <i.maximets@ovn.org> | 2021-05-10 17:57:45 +0200 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2021-05-11 16:27:48 +0200 |
| commit | 2a3d1f497152505e2d27febf1ff5329e3a277164 (patch) | |
| tree | 7d3bf4ca3c0901be3c27630f12875148f5006bec | |
| parent | 4ab5524dbb6f71232230a4a7cd7e13313c5db28b (diff) | |
| download | openvswitch-2a3d1f497152505e2d27febf1ff5329e3a277164.tar.gz | |
doc: automake: Add support for sphinx 4.0.
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] https://github.com/sphinx-doc/sphinx/issues/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>
| -rw-r--r-- | Documentation/automake.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/automake.mk b/Documentation/automake.mk index 22976a3cd..f46ec988a 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -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: |