qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] docs: set CONFDIR when running sphinx


From: Paolo Bonzini
Subject: Re: [PATCH] docs: set CONFDIR when running sphinx
Date: Wed, 2 Dec 2020 10:05:50 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0

On 01/12/20 19:37, marcandre.lureau@redhat.com wrote:
From: Marc-André Lureau <marcandre.lureau@redhat.com>

The default configuration path /etc/qemu can be overriden with configure
options, and the generated documentation used to reflect it.

Fixes regression introduced in commit
f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
  docs/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/meson.build b/docs/meson.build
index ebd85d59f9..bb8fe4c9e4 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -9,7 +9,7 @@ endif
  # Check if tools are available to build documentation.
  build_docs = false
  if sphinx_build.found()
-  SPHINX_ARGS = [sphinx_build]
+  SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
    # If we're making warnings fatal, apply this to Sphinx runs as well
    if get_option('werror')
      SPHINX_ARGS += [ '-W' ]


I can queue the patch, but I also wouldn't mind removing support for /etc/qemu completely. I'm not sure why one would use it. Eduardo?




reply via email to

[Prev in Thread] Current Thread [Next in Thread]