From 444f2e70e705ec7c474da2e98ca8c6d23f094b75 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 18 Jun 2020 01:50:48 +0200 Subject: [PATCH] meson: tools: install libvirt-guests sysconf file Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- tools/Makefile.am | 13 ++----------- tools/meson.build | 8 ++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0b59577024..2f8669e5d2 100644 --- 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 d595e5807a..0d39054db2 100644 --- 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