From nobody Wed Jul 9 22:54:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519227345226438.65201078553866; Wed, 21 Feb 2018 07:35:45 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA157272AB; Wed, 21 Feb 2018 15:35:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A362C60603; Wed, 21 Feb 2018 15:35:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 67340181A878; Wed, 21 Feb 2018 15:35:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1LFZYXk020937 for ; Wed, 21 Feb 2018 10:35:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7CBD010A9717; Wed, 21 Feb 2018 15:35:34 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0726810A9711; Wed, 21 Feb 2018 15:35:33 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 21 Feb 2018 15:35:18 +0000 Message-Id: <20180221153525.14973-4-berrange@redhat.com> In-Reply-To: <20180221153525.14973-1-berrange@redhat.com> References: <20180221153525.14973-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/10] src: simplify sysconfig file handling in make rules X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 21 Feb 2018 15:35:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 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=C3=A9 --- src/Makefile.am | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index de2441dd6b..bb51be50d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2683,23 +2683,30 @@ EXTRA_DIST +=3D $(LOCK_DAEMON_SOURCES) \ $(LOG_DAEMON_SOURCES) endif ! WITH_LIBVIRTD =20 -EXTRA_DIST +=3D \ +SYSCONF_FILES =3D \ locking/virtlockd.sysconf \ + logging/virtlogd.sysconf \ + $(NULL) + +EXTRA_DIST +=3D \ locking/lockd.conf \ locking/libvirt_lockd.aug \ - locking/test_libvirt_lockd.aug.in \ - logging/virtlogd.sysconf + locking/test_libvirt_lockd.aug.in =20 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=3D%) ; \ + do \ + tgt=3D`basename $$f`; \ + $(INSTALL_SCRIPT) $$f.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ + done =20 uninstall-sysconfig: - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd + for f in $(SYSCONF_FILES:%.sysconf=3D%) ; \ + do \ + tgt=3D`basename $$f`; \ + rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ + done rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : =20 SYSVINIT_FILES_IN =3D \ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list