Browse Source

doc: fix the configuration path

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 <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <2018112610.30973-1-marcandre.lureau@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
master
Marc-André Lureau 6 months ago
parent
commit
e8338fdbbb
2 changed files with 8 additions and 5 deletions
  1. 6
    3
      Makefile
  2. 2
    2
      qemu-ga.texi

+ 6
- 3
Makefile View File

@@ -899,11 +899,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
899 899
 MAKEINFO=makeinfo
900 900
 MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
901 901
 MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
902
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
902
+TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
903 903
 TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
904 904
 
905
-docs/version.texi: $(SRC_PATH)/VERSION
906
-	$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
905
+docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
906
+	$(call quiet-command,(\
907
+		echo "@set VERSION $(VERSION)" && \
908
+		echo "@set CONFDIR $(qemu_confdir)" \
909
+	)> $@,"GEN","$@")
907 910
 
908 911
 %.html: %.texi docs/version.texi
909 912
 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \

+ 2
- 2
qemu-ga.texi View File

@@ -30,7 +30,7 @@ set user's password
30 30
 @end itemize
31 31
 
32 32
 qemu-ga will read a system configuration file on startup (located at
33
-@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
33
+@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
34 34
 configuration options on the command line. For the same key, the last
35 35
 option wins, but the lists accumulate (see below for configuration
36 36
 file format).
@@ -58,7 +58,7 @@ file format).
58 58
   Enable fsfreeze hook. Accepts an optional argument that specifies
59 59
   script to run on freeze/thaw. Script will be called with
60 60
   'freeze'/'thaw' arguments accordingly (default is
61
-  @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
61
+  @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
62 62
   not follow -F with a space (for example:
63 63
   @samp{-F/var/run/fsfreezehook.sh}).
64 64
 

Loading…
Cancel
Save