meson: tools: install libvirt-guests sysconf 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/tools/Makefile.am b/tools/Makefile.am
index 0b59577024c5190d28af68aa8bcf323a5acb4e25..2f8669e5d22c0072fc0ec2edbc431a2ceb3120c7 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,24 +31,15 @@ install-data-local: install-systemd install-nss \
 uninstall-local: uninstall-systemd uninstall-nss \
        uninstall-bash-completion
 
-install-sysconfig:
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-       $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
-         $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-
-uninstall-sysconfig:
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-       rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
-
 SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
 
 if LIBVIRT_INIT_SCRIPT_SYSTEMD
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
+install-systemd: libvirt-guests.service libvirt-guests.sh
        $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
        $(INSTALL_DATA) libvirt-guests.service \
          $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
 
-uninstall-systemd: uninstall-sysconfig
+uninstall-systemd:
        rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
        rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
 

diff --git a/tools/meson.build b/tools/meson.build
index d595e5807a26defc30fa6d210a52ef961b648cb6..0d39054db2d6578c27851e984385fdac3df82196 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -269,3 +269,11 @@ configure_file(
   install_dir: libexecdir,
   install_mode: 'rwxrwxr-x',
 )
+
+if init_script == 'systemd'
+  install_data(
+    'libvirt-guests.sysconf',
+    install_dir: sysconfdir / 'sysconfig',
+    rename: 'libvirt-guests',
+  )
+endif