| Message ID | 20190308135744.6480-4-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Fix various issues with Sphinx build machinery | expand |
On 3/8/19 2:57 PM, Peter Maydell wrote: > If we're doing an out-of-tree build of Sphinx, then we > copy some extra spurious files to the install directory > as part of 'make install': > qemu-ga-qapi.texi > qemu-ga-ref.7 > qemu-ga-ref.7.pod > qemu-ga-ref.html > qemu-ga-ref.txt > qemu-qmp-qapi.texi > qemu-qmp-ref.7 > qemu-qmp-ref.7.pod > qemu-qmp-ref.html > qemu-qmp-ref.txt > > because these have been built into build/docs/interop along > with the Sphinx interop documents. Filter them out of the > set of files we install when we're installing the Sphinx-built > manual files. (They are installed into their correct locations > as part of the main install-doc target already.) > > Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 9fd7f3f9bfb..6ccb8639b08 100644 > --- a/Makefile > +++ b/Makefile > @@ -727,9 +727,11 @@ else > BLOBS= > endif > > +# Note that we manually filter-out the non-Sphinx documentation which > +# is currently built into the docs/interop directory in the build tree. > define install-manual = > for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done > -for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done > +for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f -a '!' '(' -name 'qemu-*-qapi.*' -o -name 'qemu-*-ref.*' ')' ); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done > endef > > # Note that we deliberately do not install the "devel" manual: it is >
diff --git a/Makefile b/Makefile index 9fd7f3f9bfb..6ccb8639b08 100644 --- a/Makefile +++ b/Makefile @@ -727,9 +727,11 @@ else BLOBS= endif +# Note that we manually filter-out the non-Sphinx documentation which +# is currently built into the docs/interop directory in the build tree. define install-manual = for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done -for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done +for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f -a '!' '(' -name 'qemu-*-qapi.*' -o -name 'qemu-*-ref.*' ')' ); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done endef # Note that we deliberately do not install the "devel" manual: it is
If we're doing an out-of-tree build of Sphinx, then we copy some extra spurious files to the install directory as part of 'make install': qemu-ga-qapi.texi qemu-ga-ref.7 qemu-ga-ref.7.pod qemu-ga-ref.html qemu-ga-ref.txt qemu-qmp-qapi.texi qemu-qmp-ref.7 qemu-qmp-ref.7.pod qemu-qmp-ref.html qemu-qmp-ref.txt because these have been built into build/docs/interop along with the Sphinx interop documents. Filter them out of the set of files we install when we're installing the Sphinx-built manual files. (They are installed into their correct locations as part of the main install-doc target already.) Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)