[libvirt PATCH 262/351] meson: tools: generate virt-pki-validate script

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:58:18 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tools/Makefile.am | 6 ------
 tools/meson.build | 9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6040e7e74ad..ee7f8b5b1ab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,7 +24,6 @@ STANDALONE_CPPFLAGS = -I$(top_srcdir)
 confdir = $(sysconfdir)/libvirt
 conf_DATA =
 
-bin_SCRIPTS = virt-pki-validate
 libexec_SCRIPTS = libvirt-guests.sh
 
 if WITH_SANLOCK
@@ -35,11 +34,6 @@ if WITH_LOGIN_SHELL
 conf_DATA += virt-login-shell.conf
 endif WITH_LOGIN_SHELL
 
-virt-pki-validate: virt-pki-validate.in Makefile
-	$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|g' \
-		       -e 's|[@]VERSION@|$(VERSION)|g' \
-	  < $< > $@ || (rm $@ && exit 1) && chmod +x $@
-
 virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
 	$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \
 	    -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \
diff --git a/tools/meson.build b/tools/meson.build
index 5e985cff593..50a7267f911 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -219,6 +219,7 @@ executable(
 tools_conf = configuration_data()
 tools_conf.set('VERSION', meson.project_version())
 tools_conf.set('schemadir', pkgdatadir / 'schemas')
+tools_conf.set('sysconfdir', sysconfdir)
 
 configure_file(
   input: 'virt-xml-validate.in',
@@ -227,3 +228,11 @@ configure_file(
   install: true,
   install_dir: bindir,
 )
+
+configure_file(
+  input: 'virt-pki-validate.in',
+  output: 'virt-pki-validate',
+  configuration: tools_conf,
+  install: true,
+  install_dir: bindir,
+)
-- 
2.26.2




More information about the libvir-list mailing list