Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tools/Makefile.am | 7 +------
tools/meson.build | 12 ++++++++++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5a0614756f9..6040e7e74ad 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,7 +24,7 @@ STANDALONE_CPPFLAGS = -I$(top_srcdir)
confdir = $(sysconfdir)/libvirt
conf_DATA =
-bin_SCRIPTS = virt-xml-validate virt-pki-validate
+bin_SCRIPTS = virt-pki-validate
libexec_SCRIPTS = libvirt-guests.sh
if WITH_SANLOCK
@@ -35,11 +35,6 @@ if WITH_LOGIN_SHELL
conf_DATA += virt-login-shell.conf
endif WITH_LOGIN_SHELL
-virt-xml-validate: virt-xml-validate.in Makefile
- $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
- -e 's|[@]VERSION@|$(VERSION)|g' \
- < $< > $@ || (rm $@ && exit 1) && chmod +x $@
-
virt-pki-validate: virt-pki-validate.in Makefile
$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \
diff --git a/tools/meson.build b/tools/meson.build
index d2d82903f1c..5e985cff593 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -215,3 +215,15 @@ executable(
install_dir: bindir,
install_rpath: libdir,
)
+
+tools_conf = configuration_data()
+tools_conf.set('VERSION', meson.project_version())
+tools_conf.set('schemadir', pkgdatadir / 'schemas')
+
+configure_file(
+ input: 'virt-xml-validate.in',
+ output: 'virt-xml-validate',
+ configuration: tools_conf,
+ install: true,
+ install_dir: bindir,
+)
--
2.26.2
