meson: src/remote: install polkit files

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/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index f80f4a06325b7ddf927000ce200fdf25a82d894e..6a4af4aad31b2a33da65164ba8f688ef03e80bfa 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -1,32 +1,5 @@
 # vim: filetype=automake
 
-if WITH_LIBVIRTD
-
-if WITH_POLKIT
-polkitdir = $(datadir)/polkit-1
-polkitactionsdir = $(polkitdir)/actions
-polkitrulesdir = $(polkitdir)/rules.d
-
-install-polkit:
-       $(MKDIR_P) $(DESTDIR)$(polkitactionsdir)
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \
-               $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
-       $(MKDIR_P) $(DESTDIR)$(polkitrulesdir)
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
-               $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
-
-uninstall-polkit:
-       rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
-       rmdir $(DESTDIR)$(polkitactionsdir) || :
-       rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
-       rmdir $(DESTDIR)$(polkitrulesdir) || :
-
-INSTALL_DATA_LOCAL += install-polkit
-UNINSTALL_LOCAL += uninstall-polkit
-endif WITH_POLKIT
-
-endif WITH_LIBVIRTD
-
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 if WITH_SASL

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 2aedad1881c7b7591ed75d2afb83c163062796e5..4eb1efe903c2c98113087f45677fe34826cf2d6f 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -246,6 +246,20 @@ if conf.has('WITH_REMOTE')
         rename: [ '60-libvirtd.conf' ],
       )
     endif
+
+    if conf.has('WITH_POLKIT')
+      polkitdir = datadir / 'polkit-1'
+      install_data(
+        'libvirtd.policy',
+        install_dir: polkitdir / 'actions',
+        rename: [ 'org.libvirt.unix.policy' ],
+      )
+      install_data(
+        'libvirtd.rules',
+        install_dir: polkitdir / 'rules.d',
+        rename: [ '50-libvirt.rules' ],
+      )
+    endif
   endif
 endif