From: Pavel Hrdina <phrdina@redhat.com>
Date: Tue, 23 Jun 2020 11:55:37 +0000 (+0200)
Subject: meson: src/remote: install libvirt sysctl config file
X-Git-Tag: v6.7.0-rc1~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee04534af3597eb446ffde7ad1a38fb762b3c0f;p=thirdparty%2Flibvirt.git

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 8fbe8425b3..f80f4a0632 100644
--- 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 c8b1f8f306..2aedad1881 100644
--- 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