]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
src: simplify sysconfig file handling in make rules
authorDaniel P. Berrangé <berrange@redhat.com>
Tue, 20 Feb 2018 14:28:00 +0000 (14:28 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Thu, 22 Feb 2018 11:30:36 +0000 (11:30 +0000)
Remove lots of duplication in the sysconfig file handling, so we can
add more conf files without modifying so many places.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/Makefile.am

index de2441dd6ba4d90e390eaa73bdc6a322ebd77e90..9fc4d876aea6576ebef10f81b352ff3137c3c6a2 100644 (file)
@@ -2683,23 +2683,32 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
              $(LOG_DAEMON_SOURCES)
 endif ! WITH_LIBVIRTD
 
-EXTRA_DIST += \
+SYSCONF_FILES = \
        locking/virtlockd.sysconf \
+       logging/virtlogd.sysconf \
+       $(NULL)
+
+EXTRA_DIST += \
        locking/lockd.conf \
        locking/libvirt_lockd.aug \
        locking/test_libvirt_lockd.aug.in \
-       logging/virtlogd.sysconf
+       $(SYSCONF_FILES) \
+       $(NULL)
 
 install-sysconfig:
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-       $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
-         $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
-       $(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \
-         $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
+       for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+       do \
+         tgt=`basename $$f`; \
+         $(INSTALL_SCRIPT) $$f.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+       done
 
 uninstall-sysconfig:
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
+       for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+       do \
+         tgt=`basename $$f`; \
+         rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+       done
        rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
 
 SYSVINIT_FILES_IN = \