From nobody Mon Apr 29 10:21:10 2024 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 1519731017005687.201306124962; Tue, 27 Feb 2018 03:30:17 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 116FA7FEA3; Tue, 27 Feb 2018 11:30:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4520C1347E; Tue, 27 Feb 2018 11:30:14 +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 F021B4A46D; Tue, 27 Feb 2018 11:30:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1RBUA3c016287 for ; Tue, 27 Feb 2018 06:30:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id D76D32144B26; Tue, 27 Feb 2018 11:30:10 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7802D2144B21; Tue, 27 Feb 2018 11:30:10 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 27 Feb 2018 11:30:07 +0000 Message-Id: <20180227113007.30640-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] make: fix uninstall of subdirectory data 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 27 Feb 2018 11:30:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 A typo in the uninstall-data-extra rule expansion meant we just called the install rule again, instead of the uninstall rule. While fixing this, just inline the dependancy, since the intermediate install-data-extra rule adds no value. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 46724673d2..d3a01dbbe7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,9 +99,6 @@ include xenapi/Makefile.inc.am include vz/Makefile.inc.am include lxc/Makefile.inc.am =20 -install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) -uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) - =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) =20 @@ -2863,7 +2860,7 @@ endif WITH_NSS =20 install-data-local: install-init install-systemd install-upstart \ install-sysctl install-polkit install-sasl \ - install-logrotate install-data-extra + install-logrotate $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) if WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" @@ -2899,7 +2896,7 @@ endif WITH_NETWORK =20 uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ - uninstall-logrotate uninstall-data-extra + uninstall-logrotate $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) if WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list