diff mbox series

[117/132] meson: generate version.texi

Message ID 1576758232-12439-26-git-send-email-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series Proof of concept for Meson integration | expand

Commit Message

Paolo Bonzini Dec. 19, 2019, 12:23 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 Makefile             | 6 ------
 docs/meson.build     | 4 ++++
 docs/version.texi.in | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 docs/version.texi.in
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index d60a0c9..c1ea39f 100644
--- a/Makefile
+++ b/Makefile
@@ -404,12 +404,6 @@  MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
 TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
 TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
 
-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 \
 	--html $< -o $@,"GEN","$@")
diff --git a/docs/meson.build b/docs/meson.build
index 8680aaa..c71fff9 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,7 @@ 
+configure_file(output: 'version.texi',
+               input: 'version.texi.in',
+               configuration: config_host)
+
 sphinx = find_program('sphinx-build', required: build_docs)
 
 if sphinx.found()
diff --git a/docs/version.texi.in b/docs/version.texi.in
new file mode 100644
index 0000000..0a723b8
--- /dev/null
+++ b/docs/version.texi.in
@@ -0,0 +1,2 @@ 
+@set VERSION @VERSION@
+@set CONFDIR @qemu_confdir@