From nobody Wed May 14 18:33:49 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 151922735141180.34157674792073; Wed, 21 Feb 2018 07:35:51 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A2D35A72; Wed, 21 Feb 2018 15:35:49 +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 5545F5D968; Wed, 21 Feb 2018 15:35: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 1DA594A475; Wed, 21 Feb 2018 15:35:49 +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 w1LFZb6o020967 for ; Wed, 21 Feb 2018 10:35:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97D9B10A9713; Wed, 21 Feb 2018 15:35:37 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id C14B610A9711; Wed, 21 Feb 2018 15:35:36 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 21 Feb 2018 15:35:21 +0000 Message-Id: <20180221153525.14973-7-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 06/10] daemon: move libvirtd POD manpage into src/remote/ 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 21 Feb 2018 15:35:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- daemon/Makefile.am | 34 +--------------------------------- src/Makefile.am | 14 +++++++++++++- {daemon =3D> src/remote}/libvirtd.pod | 0 3 files changed, 14 insertions(+), 34 deletions(-) rename {daemon =3D> src/remote}/libvirtd.pod (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 4f682fa740..012aced9c9 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -18,14 +18,6 @@ =20 CLEANFILES =3D =20 -PODFILES =3D \ - libvirtd.pod \ - $(NULL) - -MANINFILES =3D \ - libvirtd.8.in \ - $(NULL) - DISTCLEANFILES =3D EXTRA_DIST =3D \ libvirtd.conf \ @@ -46,16 +38,12 @@ EXTRA_DIST =3D \ libvirtd.uml.logrotate.in \ test_libvirtd.aug.in \ THREADS.txt \ - $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 BUILT_SOURCES =3D =20 if WITH_LIBVIRTD =20 -man8_MANS =3D libvirtd.8 - confdir =3D $(sysconfdir)/libvirt/ conf_DATA =3D libvirtd.conf =20 @@ -301,25 +289,6 @@ install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl endif ! WITH_LIBVIRTD =20 -POD2MAN =3D pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" - -%.8.in: %.pod - $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - -%.8: %.8.in $(top_srcdir)/configure.ac - $(AM_V_GEN)sed \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if WITH_SASL @@ -337,6 +306,5 @@ uninstall-data-sasl: endif ! WITH_SASL =20 =20 -CLEANFILES +=3D $(BUILT_SOURCES) $(man8_MANS) +CLEANFILES +=3D $(BUILT_SOURCES) CLEANFILES +=3D *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -MAINTAINERCLEANFILES =3D $(MANINFILES) diff --git a/src/Makefile.am b/src/Makefile.am index a1e5fa573e..ff22e1f7ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2863,6 +2863,16 @@ virtlogd.8.in: logging/virtlogd.pod rm -f $@-t1 && \ mv $@-t2 $@ =20 +libvirtd.8.in: remote/libvirtd.pod + $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ + %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ @@ -2871,7 +2881,7 @@ virtlogd.8.in: logging/virtlogd.pod mv $@-t $@ =20 if WITH_LIBVIRTD -man8_MANS =3D virtlockd.8 virtlogd.8 +man8_MANS =3D virtlockd.8 virtlogd.8 libvirtd.8 =20 conf_DATA +=3D locking/virtlockd.conf logging/virtlogd.conf =20 @@ -2882,11 +2892,13 @@ endif WITH_LIBVIRTD PODFILES =3D \ locking/virtlockd.pod \ logging/virtlogd.pod \ + remote/libvirtd.pod \ $(NULL) =20 MANINFILES =3D \ virtlockd.8.in \ virtlogd.8.in \ + libvirtd.8.in \ $(NULL) =20 CLEANFILES +=3D test_virtlockd.aug test_virtlogd.aug $(man8_MANS) diff --git a/daemon/libvirtd.pod b/src/remote/libvirtd.pod similarity index 100% rename from daemon/libvirtd.pod rename to src/remote/libvirtd.pod --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list