From 5adcf83a36b33d41fbe7136f3c6b1abadecb0bec Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 23 Jun 2020 14:09:16 +0200 Subject: [PATCH] meson: src/remote: install libvirtd sasl file Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 ddb84c80d1..b42d136289 100644 --- 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 index 6a4af4aad3..0000000000 --- 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 4eb1efe903..53ad3a6173 100644 --- 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('.')