[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Makefile: Fix in-tree builds when Sphinx is available
From: |
Peter Maydell |
Subject: |
Re: [PATCH] Makefile: Fix in-tree builds when Sphinx is available |
Date: |
Fri, 20 Sep 2019 13:56:47 +0100 |
On Fri, 20 Sep 2019 at 13:27, Eric Blake <address@hidden> wrote:
>
> On 9/19/19 10:59 AM, Peter Maydell wrote:
> > In commit 27a296fce9821e we switched the qemu-ga manpage over to
> > being built from Sphinx. The makefile rules for this were correct
> > for an out-of-tree build, but break for in-tree builds if Sphinx is
> > present and we're trying to build the documentation.
> >
>
> > Fix this by using $(MANUAL_BUILDDIR) when constructing the
> > list of DOCS files we want to build and also in the source
> > file name we install for 'make install'.
> >
> > (Among other things, this broke the Shippable CI builds.)
> >
> > Reported-by: Eric Blake <address@hidden>
> > Signed-off-by: Peter Maydell <address@hidden>
> > ---
> > Makefile | 26 +++++++++++++-------------
> > 1 file changed, 13 insertions(+), 13 deletions(-)
>
> Tested in-tree builds both with and without sphinx installed:
>
> Tested-by: Eric Blake <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
Thanks; applied patch to master as a buildfix.
-- PMM