[libvirt PATCH 238/351] meson: src/remote: install libvirtd sasl file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 1 -
src/remote/Makefile.inc.am | 19 -------------------
src/remote/meson.build | 10 ++++++++++
3 files changed, 10 insertions(+), 20 deletions(-)
delete mode 100644 src/remote/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 7305a069f07..acdbe30e0e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,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
# .libs/libvirt.so is built by libtool as a side-effect of the Makefile
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
deleted file mode 100644
index 6a4af4aad31..00000000000
--- 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 1169403722f..055857ae360 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -252,4 +252,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('.')
--
2.26.2