[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 05/13] doc: fix the configuration path
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 05/13] doc: fix the configuration path |
Date: |
Thu, 2 May 2019 20:58:27 +0200 |
From: Marc-André Lureau <address@hidden>
Use a CONFDIR variable to show the configured sysconf path in the
generated documentations (html, man pages etc).
Related to:
https://bugzilla.redhat.com/show_bug.cgi?id=1644985
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
qemu-ga.texi | 4 ++--
Makefile | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/qemu-ga.texi b/qemu-ga.texi
index 4c7a8fd16329..f00ad830f283 100644
--- a/qemu-ga.texi
+++ b/qemu-ga.texi
@@ -30,7 +30,7 @@ set user's password
@end itemize
qemu-ga will read a system configuration file on startup (located at
address@hidden/etc/qemu/qemu-ga.conf} by default), then parse remaining
address@hidden@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
configuration options on the command line. For the same key, the last
option wins, but the lists accumulate (see below for configuration
file format).
@@ -58,7 +58,7 @@ file format).
Enable fsfreeze hook. Accepts an optional argument that specifies
script to run on freeze/thaw. Script will be called with
'freeze'/'thaw' arguments accordingly (default is
- @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
+ @address@hidden/fsfreeze-hook}). If using -F with an argument, do
not follow -F with a space (for example:
@samp{-F/var/run/fsfreezehook.sh}).
diff --git a/Makefile b/Makefile
index 1211e78c91ed..43a7a047b452 100644
--- a/Makefile
+++ b/Makefile
@@ -899,11 +899,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
MAKEINFO=makeinfo
MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
+TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)"
-DCONFDIR="$(qemu_confdir)"
TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
-docs/version.texi: $(SRC_PATH)/VERSION
- $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
+docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
+ $(call quiet-command,(\
+ echo "@set VERSION $(VERSION)" && \
+ echo "@set CONFDIR $(qemu_confdir)" \
+ )> $@,"GEN","$@")
%.html: %.texi docs/version.texi
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers
\
--
2.20.1
- [Qemu-trivial] [PULL 00/13] Trivial branch patches, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 01/13] hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 08/13] Update configure, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 09/13] Header cleanups, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 07/13] configure: fix pam test warning, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 04/13] Clean up includes, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 05/13] doc: fix the configuration path,
Laurent Vivier <=
- [Qemu-trivial] [PULL 06/13] qom: use object_new_with_type in object_new_with_propv, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 11/13] Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 02/13] CODING_STYLE: specify the indent rule for multiline code, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 13/13] sockets: avoid string truncation warnings when copying UNIX path, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwares, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 03/13] CODING_STYLE: indent example code as all others, Laurent Vivier, 2019/05/02
- Re: [Qemu-trivial] [PULL 00/13] Trivial branch patches, Peter Maydell, 2019/05/03