[ovs-dev] [PATCH] doc: automake: Add support for sphinx 4.0.
Ilya Maximets
i.maximets at ovn.org
Mon May 10 15:57:45 UTC 2021
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 at ovn.org>
---
Successful build:
https://github.com/igsilya/ovs/actions/runs/828587071
Documentation/automake.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/automake.mk b/Documentation/automake.mk
index ea3475f35..2a590b3a7 100644
--- a/Documentation/automake.mk
+++ b/Documentation/automake.mk
@@ -216,8 +216,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:
--
2.26.3
More information about the dev
mailing list