meson: src/remote: install libvirt sysctl config 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/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 8fbe8425b3bb007e16164e0eb80973edec3b782d..f80f4a06325b7ddf927000ce200fdf25a82d894e 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -2,24 +2,6 @@
 
 if WITH_LIBVIRTD
 
-if WITH_SYSCTL
-# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
-# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
-sysctldir = $(prefix)/lib/sysctl.d
-
-install-sysctl:
-       $(MKDIR_P) $(DESTDIR)$(sysctldir)
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
-         $(DESTDIR)$(sysctldir)/60-libvirtd.conf
-
-uninstall-sysctl:
-       rm -f $(DESTDIR)$(sysctldir)/60-libvirtd.conf
-       rmdir $(DESTDIR)$(sysctldir) || :
-
-INSTALL_DATA_LOCAL += install-sysctl
-UNINSTALL_LOCAL += uninstall-sysctl
-endif WITH_SYSCTL
-
 if WITH_POLKIT
 polkitdir = $(datadir)/polkit-1
 polkitactionsdir = $(polkitdir)/actions

diff --git a/src/remote/meson.build b/src/remote/meson.build
index c8b1f8f30654bf6f13d3f5cd8aac9668167ebe65..2aedad1881c7b7591ed75d2afb83c163062796e5 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -236,6 +236,16 @@ if conf.has('WITH_REMOTE')
         rename: [ name ],
       )
     endforeach
+
+    if conf.has('WITH_SYSCTL')
+      # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+      # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+      install_data(
+        'libvirtd.sysctl',
+        install_dir: prefix / 'lib' / 'sysctl.d',
+        rename: [ '60-libvirtd.conf' ],
+      )
+    endif
   endif
 endif