Reviewed-by: Niek Linnenbank <nieklinnenb...@gmail.com> On Mon, Mar 9, 2020 at 10:58 PM Peter Maydell <peter.mayd...@linaro.org> wrote:
> Currently we put 'docs/foo/*.rst' in the Make list of dependencies > for the Sphinx 'foo' manual, which means all the files must be > in the top level of that manual's directory. We'd like to be > able to have subdirectories inside some of the manuals, so add > 'docs/foo/*/*.rst' to the dependencies too. > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 2e930688942..5dba949947a 100644 > --- a/Makefile > +++ b/Makefile > @@ -1081,7 +1081,7 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ > # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946 > build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" > $(SPHINX_BUILD) $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D > release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 > $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1") > # We assume all RST files in the manual's directory are used in it > -manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) \ > +manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst > $(SRC_PATH)/docs/$1/*/*.rst) \ > $(SRC_PATH)/docs/defs.rst.inc \ > $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py > # Macro to write out the rule and dependencies for building manpages > -- > 2.20.1 > > -- Niek Linnenbank
