[libvirt PATCH 236/351] meson: src/remote: install libvirt sysctl config file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/remote/Makefile.inc.am | 18 ------------------
src/remote/meson.build | 10 ++++++++++
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 8fbe8425b3b..f80f4a06325 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 3b9f6117b62..cd6e849c9a8 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -219,6 +219,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
--
2.26.2