meson: src/remote: install libvirtd sasl file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index ddb84c80d12a2704fe63be128e34b325f0ef59fd..b42d13628980d8c1b479a9a3c9373f7e96720c98 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,6 @@ include nwfilter/Makefile.inc.am
 include node_device/Makefile.inc.am
 include secret/Makefile.inc.am
 include storage/Makefile.inc.am
-include remote/Makefile.inc.am
 
 
 BUILT_SOURCES += $(nodist_conf_DATA)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
deleted file mode 100644 (file)
index 6a4af4a..0000000
--- a/src/remote/Makefile.inc.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=automake
-
-# This is needed for clients too, so can't wrap in
-# the WITH_LIBVIRTD conditional
-if WITH_SASL
-sasldir = $(sysconfdir)/sasl2
-
-install-sasl:
-       $(MKDIR_P) $(DESTDIR)$(sasldir)
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
-               $(DESTDIR)$(sasldir)/libvirt.conf
-
-uninstall-sasl:
-       rm -f $(DESTDIR)$(sasldir)/libvirt.conf
-       rmdir $(DESTDIR)$(sasldir) || :
-
-INSTALL_DATA_LOCAL += install-sasl
-UNINSTALL_LOCAL += uninstall-sasl
-endif WITH_SASL

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 4eb1efe903c2c98113087f45677fe34826cf2d6f..53ad3a6173a9285c6ae22510f99f93bb0648b995 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -269,4 +269,14 @@ else
   sym_files += 'libvirt_remote.syms'
 endif
 
+# This is needed for clients too, so can't wrap in
+# the WITH_LIBVIRTD conditional
+if conf.has('WITH_SASL')
+  install_data(
+    'libvirtd.sasl',
+    install_dir: sysconfdir / 'sasl2',
+    rename: [ 'libvirt.conf' ],
+  )
+endif
+
 remote_inc_dir = include_directories('.')