From nobody Thu May 2 14:01:19 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 ARC-Seal: i=1; a=rsa-sha256; t=1571409473; cv=none; d=zoho.com; s=zohoarc; b=nxcoVGRQ7RXapOYeh3CBZPDQmae3DeKZ3f2BFgauPCCEnI0l4dfomtXEY0mYUf2FnZ7aGDbmQcwicrWdKNWCKkCLCMKNnPnSMACWyYxkiCRK0X/b3j6gPnjtvRfsGQXeU5/ctU3Vg7UgA/C3YxWaPUXydcmxLY0xuyfx58ASNWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571409473; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=X7djuWi7UwQn++QztghU+iBsJcffmBqZNsd7nqMch2w=; b=fYgB9BX14uSURO4rpXV86OUZITUhmfyF1eTZNk899gLXkc93WIRIKdIYJx2Ae/dlCORzdxbwfebWTdSDKWiLR+h9o3xC3UrJ4Hkg9RM2Luw4Uf/pipkDkG4FJ7iKOcmzJOn9svC4sBTX2rRPBp6kL9mGRMf1Ry/1XJBHn7TcuQA= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571409473929378.196428882707; Fri, 18 Oct 2019 07:37:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97DC02BFDC; Fri, 18 Oct 2019 14:37:51 +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 E1D6B1001B00; Fri, 18 Oct 2019 14:37:49 +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 DAF624EE68; Fri, 18 Oct 2019 14:37:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9IEXCY5030728 for ; Fri, 18 Oct 2019 10:33:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 230B25C21E; Fri, 18 Oct 2019 14:33:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B49A5C290; Fri, 18 Oct 2019 14:33:02 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 18 Oct 2019 15:33:01 +0100 Message-Id: <20191018143301.22677-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] build: fix substitution of RUNSTATEDIR in man pages 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 18 Oct 2019 14:37:52 +0000 (UTC) When RUNSTATEDIR was introduced commit d29c917ef470a25149d1f3787ec494d006549f27 Author: Daniel P. Berrang=C3=A9 Date: Tue Aug 20 16:05:12 2019 +0100 src: honour the RUNSTATEDIR variable in all code The makefile rules for man pages were accidentally not updated for the new variablle name. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- src/Makefile.am | 2 +- src/locking/Makefile.inc.am | 2 +- src/logging/Makefile.inc.am | 2 +- src/remote/Makefile.inc.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 937f5216da..a7c1ad0861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -725,7 +725,7 @@ endif WITH_LIBVIRTD %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index eccf7c3a4d..a0822f77d4 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -280,7 +280,7 @@ virtlockd.8.in: locking/virtlockd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 74e94636a6..6eda40275c 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -118,7 +118,7 @@ virtlogd.8.in: logging/virtlogd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 071d19d26a..0f4f1ae8d5 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -455,7 +455,7 @@ libvirtd.8.in: remote/libvirtd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list