| Message ID | 20190308135744.6480-3-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix various issues with Sphinx build machinery | expand |
On 3/8/19 2:57 PM, Peter Maydell wrote: > We forgot the '-r' option on the rm command to clean up the > Sphinx .doctrees working directory, which meant that > "make distclean" fails: > rm: cannot remove '.doctrees': Is a directory > > Add the missing option. > > 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 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 0194ef7fa55..9fd7f3f9bfb 100644 > --- a/Makefile > +++ b/Makefile > @@ -691,7 +691,7 @@ distclean: clean > rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html > rm -f docs/qemu-block-drivers.7 > rm -f docs/qemu-cpu-models.7 > - rm -f .doctrees > + rm -rf .doctrees > $(call clean-manual,devel) > $(call clean-manual,interop) > for d in $(TARGET_DIRS); do \ >
diff --git a/Makefile b/Makefile index 0194ef7fa55..9fd7f3f9bfb 100644 --- a/Makefile +++ b/Makefile @@ -691,7 +691,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 rm -f docs/qemu-cpu-models.7 - rm -f .doctrees + rm -rf .doctrees $(call clean-manual,devel) $(call clean-manual,interop) for d in $(TARGET_DIRS); do \
We forgot the '-r' option on the rm command to clean up the Sphinx .doctrees working directory, which meant that "make distclean" fails: rm: cannot remove '.doctrees': Is a directory Add the missing option. Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1