[libvirt PATCH 265/351] meson: tools: install virt-login-shell.conf

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


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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 39bc7349a88..655e22d95ea 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,13 +21,6 @@
 # needed
 STANDALONE_CPPFLAGS = -I$(top_srcdir)
 
-confdir = $(sysconfdir)/libvirt
-conf_DATA =
-
-if WITH_LOGIN_SHELL
-conf_DATA += virt-login-shell.conf
-endif WITH_LOGIN_SHELL
-
 noinst_LTLIBRARIES =
 
 install-data-local: install-systemd install-nss \
diff --git a/tools/meson.build b/tools/meson.build
index ad83dd9508b..446831557e1 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -110,6 +110,8 @@ if conf.has('WITH_LOGIN_SHELL')
     install_dir: libexecdir,
     install_rpath: libdir,
   )
+
+  install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
 endif
 
 if host_machine.system() == 'windows'
-- 
2.26.2




More information about the libvir-list mailing list