From nobody Sat Apr 20 02:41:54 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=1557514294; cv=none; d=zoho.com; s=zohoarc; b=Y8w6h+n33XMDtBzn7/GYiXUmeBSAUECCD25A8g7F9xLJIvJhml/ELOq3XNZURINqRpp/yJUG0sNzR1gDIn3auD3r5SIhsj8NC/bAr0acnEYq1R9ehA/vMk16u9JUsyUMHeY+rw4PzATbgTcVQVsQtXBTu3fRNVu1/MKdceN7MK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557514294; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Ke0fJyhLGEOqBCVkpZridx2SYvl4i93StR/R1otb8HE=; b=BmV3GC1nbGjncjbd+Dkjf6spyXJdufNKS4zfK/gMtfbI5rnng+5N+Okw45aayVw+oBmzwd6qjJS+8QmRLsh8ru4obZUOeK3nCB70gdawPUi/avdXxg51Iod8ZXcTybjQTug+BEW6cR9m887ZPBWBlt9QcdEL744pSNa72MaAxwU= 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 1557514294513312.5185505121642; Fri, 10 May 2019 11:51:34 -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 6FA5F30832D3; Fri, 10 May 2019 18:51:32 +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 CF9E11001281; Fri, 10 May 2019 18:51:31 +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 899D318089CC; Fri, 10 May 2019 18:51:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AIpQ49030868 for ; Fri, 10 May 2019 14:51:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E54B318A75; Fri, 10 May 2019 18:51:26 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-46.brq.redhat.com [10.40.204.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BC5C5E7AC for ; Fri, 10 May 2019 18:51:26 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 May 2019 20:51:17 +0200 Message-Id: <20190510185120.16355-2-abologna@redhat.com> In-Reply-To: <20190510185120.16355-1-abologna@redhat.com> References: <20190510185120.16355-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] docs: Introduce $(modules) 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-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.44]); Fri, 10 May 2019 18:51:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This variable contains a lists of documentation modules, in a neutral format. Right now is only used to define $(apihtml_generated), but later on we're gonna reuse it. Signed-off-by: Andrea Bolognani --- docs/Makefile.am | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 29b0761a2b..3a729f909c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -18,24 +18,29 @@ =20 DEVHELP_DIR=3D$(datadir)/gtk-doc/html/libvirt =20 +modules =3D \ + libvirt-common \ + libvirt-domain \ + libvirt-domain-snapshot \ + libvirt-event \ + libvirt-host \ + libvirt-interface \ + libvirt-network \ + libvirt-nodedev \ + libvirt-nwfilter \ + libvirt-secret \ + libvirt-storage \ + libvirt-stream \ + virterror \ + $(NULL) + apihtml =3D \ html/index.html \ $(apihtml_generated) =20 apihtml_generated =3D \ - html/libvirt-libvirt-common.html \ - html/libvirt-libvirt-domain.html \ - html/libvirt-libvirt-domain-snapshot.html \ - html/libvirt-libvirt-event.html \ - html/libvirt-libvirt-host.html \ - html/libvirt-libvirt-interface.html \ - html/libvirt-libvirt-network.html \ - html/libvirt-libvirt-nodedev.html \ - html/libvirt-libvirt-nwfilter.html \ - html/libvirt-libvirt-secret.html \ - html/libvirt-libvirt-storage.html \ - html/libvirt-libvirt-stream.html \ - html/libvirt-virterror.html + $(addprefix html/libvirt-,$(addsuffix .html,$(modules))) \ + $(NULL) =20 apipng =3D \ html/left.png \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 02:41:54 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=1557514315; cv=none; d=zoho.com; s=zohoarc; b=V3rnwFnTasrM1Vbmdp87Rh4qsEdI5osgrxXDTX/LVZrfgrI6rX2PD/tcEU7nKpyZbsyiSTHZv/3pxMe4zKvf5Znl/D7lL6wqWd+Q78MPurrqCgDgbhDwCaM3hxB4nOuBqBnSqVtYT7UZHuVWTyBgOGZEwoWZYjZG1JmNElBkIfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557514315; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=t9VRhneoiLYurXsfFnl1u0vgKjkTGY42Ixb8Cz4aIDE=; b=E1mL4cQ7ItxYKrjDa1+vP8QZdIUSvTJywLi6vWirlQFE4sBiZE/kcBrLMAJKu7L816oHr00ZSvIGLEOuDvL/ULTuRJKKCdKollE13hdAO1a9MQasQX9M3HS422DrOntYcVJAoPRbLoMaDScXKGQbK5n5nAPArDlr02oIZUyrvWE= 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 1557514315261400.45090436909277; Fri, 10 May 2019 11:51:55 -0700 (PDT) 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 AA47037E85; Fri, 10 May 2019 18:51:53 +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 84D53226F5; Fri, 10 May 2019 18:51:53 +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 37CBA18089D1; Fri, 10 May 2019 18:51:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AIpRWE030875 for ; Fri, 10 May 2019 14:51:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id E9E0C18A75; Fri, 10 May 2019 18:51:27 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-46.brq.redhat.com [10.40.204.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51F915ED44 for ; Fri, 10 May 2019 18:51:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 May 2019 20:51:18 +0200 Message-Id: <20190510185120.16355-3-abologna@redhat.com> In-Reply-To: <20190510185120.16355-1-abologna@redhat.com> References: <20190510185120.16355-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] docs: Introduce $(devhelphtml_generated) 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-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.29]); Fri, 10 May 2019 18:51:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Our XSLT magic generates one Devhelp-compatible HTML file per documentation module, but so far we have only shipped and installed documentation for virterror. Now that we have $(modules), however, we can generate the list of files the same way we do for regular documentation and make sure we always ship and install everything. Signed-off-by: Andrea Bolognani --- docs/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 3a729f909c..559ea2d01b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -52,7 +52,11 @@ devhelphtml =3D \ devhelp/libvirt.devhelp \ devhelp/index.html \ devhelp/general.html \ - devhelp/libvirt-virterror.html + $(devhelphtml_generated) + +devhelphtml_generated =3D \ + $(addprefix devhelp/libvirt-,$(addsuffix .html,$(modules))) \ + $(NULL) =20 css =3D \ generic.css \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 02:41:54 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=1557514315; cv=none; d=zoho.com; s=zohoarc; b=IByqHB8h+gatikw79SXY/0O9TIRLyt5BmQooWiStnxcD1yYUT+tIp/ihouhd6sh9g8YLvXoalIpwNhWx1QuMR2c10HATZvehUX82pTHEscOeyT3ShY55X4wbeSkD0M6xV2GEF97uHJjgOPxcb0UNclRgmStPNlOgQZ/ZBwA5fBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557514315; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3pGP0l6Yceis5dPPdtkODVor/lCFeB18ou1ccOrZvVw=; b=kjWJs2GA2ozEtrLu0EIdT0ypOO553FQexA0fAYpSIWdWlw69nmmjQ3fxkDa26Ez9+pVaeqnqH8Q/IQBPjCWSyMgs72uA9HHvqNBUSvyhbeQqr1SUpj1RJnAOxLsOp0I7VE6sxKaNB4jrKc77qEJ/5S/5pFBwrPWoRLAV41NvnHk= 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 1557514315103399.0895869197759; Fri, 10 May 2019 11:51:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11CE2356DE; Fri, 10 May 2019 18:51:53 +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 E104A5D717; Fri, 10 May 2019 18:51:52 +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 2AAB341F58; Fri, 10 May 2019 18:51:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AIpSQ8030885 for ; Fri, 10 May 2019 14:51:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id F043C18A75; Fri, 10 May 2019 18:51:28 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-46.brq.redhat.com [10.40.204.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 57F405E7AC for ; Fri, 10 May 2019 18:51:28 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 May 2019 20:51:19 +0200 Message-Id: <20190510185120.16355-4-abologna@redhat.com> In-Reply-To: <20190510185120.16355-1-abologna@redhat.com> References: <20190510185120.16355-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] docs: Install documentation under $(docdir) 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-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 10 May 2019 18:51:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" At the moment we allow the user to specify exactly where they want the HTML documentation to be installed with an extreme level of precision through the --with-html-dir and --with-html-subdir configure options. Most of the time, of course, the user will stick with the default, that is $(datadir)/doc/$(PACKAGE)-$(VERSION)/html. So close to $(docdir)! Including the version number in the path, specifically, seems entirely unnecessary since different releases of libvirt are not going to be able to coexist on the same system anyway. Drop all these custom flexibilty for flexibilty's sake shenaningans in favor of the standard, well understood $(docdir). Signed-off-by: Andrea Bolognani --- configure.ac | 13 ------------- docs/Makefile.am | 1 + libvirt.spec.in | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index fabec815db..7e01b77fc0 100644 --- a/configure.ac +++ b/configure.ac @@ -414,19 +414,6 @@ dnl =20 LIBVIRT_CHECK_EXTERNAL_PROGRAMS =20 - -dnl Specific dir for HTML output ? -LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory], - ['$(datadir)/doc']) -LIBVIRT_ARG_WITH([HTML_SUBDIR], [directory used under html-dir], - ['$(PACKAGE)-$(VERSION)/html']) -if test "x$with_html_subdir" !=3D "x" ; then - HTML_DIR=3D"$with_html_dir/$with_html_subdir" -else - HTML_DIR=3D"$with_html_dir" -fi -AC_SUBST([HTML_DIR]) - dnl if --prefix is /usr, don't use /usr/var for localstatedir dnl or /usr/etc for sysconfdir dnl as this makes a lot of things break in testing situations diff --git a/docs/Makefile.am b/docs/Makefile.am index 559ea2d01b..0c899f9580 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,6 +16,7 @@ ## License along with this library. If not, see ## . =20 +HTML_DIR =3D $(docdir)/html DEVHELP_DIR=3D$(datadir)/gtk-doc/html/libvirt =20 modules =3D \ diff --git a/libvirt.spec.in b/libvirt.spec.in index e07041c0b9..ea6a04c02a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1300,7 +1300,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/= test_libvirtd_libxl.aug %endif =20 # Copied into libvirt-docs subpackage eventually -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs =20 %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 02:41:54 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=1557514319; cv=none; d=zoho.com; s=zohoarc; b=ElaSPP91Vld5RwKNG0HPzBUV3e40l0fw1BEsiruGp2fc09pUBiAR84yxVlvaVys/SKJ6QUbE6Z627OT9gb/N+FewELlFxsiHy+fh9xKTaFsN8PQuAVZf3JissvJJ9bHIQHXwkagiMqyms6YaB7SiwHLdxb7oP61oF4isL9+hGyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557514319; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7Z8lKes44E5lTAhQ7cCA2wo+ym8pZVU8hyG/aE11GJU=; b=KFPVL0skYBs9sIwDH0+XfkZ/tOfP1lNkmQo2YX+KWvIzHvx/zFX5UIZuJpJQfJnxRpgBGbl3iUPKz6v4nEFfAotS1eyzRArdwU7mLjpkm4KqF/cBFHVEpn5JaZdaOwGGy5ziR4DZntWl+lvaDSZ7LgaLuZXs6G2Z1PqoWghnydY= 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 1557514319793602.8586898247179; Fri, 10 May 2019 11:51:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCF0081DF3; Fri, 10 May 2019 18:51:57 +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 A732261082; Fri, 10 May 2019 18:51:57 +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 6C14E18089D4; Fri, 10 May 2019 18:51:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AIpU6Q030896 for ; Fri, 10 May 2019 14:51:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 01D4A18A75; Fri, 10 May 2019 18:51:30 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-46.brq.redhat.com [10.40.204.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5EDC05E7AC for ; Fri, 10 May 2019 18:51:29 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 May 2019 20:51:20 +0200 Message-Id: <20190510185120.16355-5-abologna@redhat.com> In-Reply-To: <20190510185120.16355-1-abologna@redhat.com> References: <20190510185120.16355-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] examples: Install under $(docdir) 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-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 10 May 2019 18:51:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Our build system doesn't currently install the various example programs provided along libvirt; however, both the upstream .spec file and the Debian packaging go out of their way to make sure these useful demos are included in the respective documentation packages. Moreover, doing so without help from the upstream build system is easy to get wrong: the libvirt-docs RPM package, for example, ends up missing one of the examples and including a bunch of empty .deps/ directories. Install the examples in $(docdir) as part of our regular procedure, so that users and downstreams don't have to do anything special about them. Signed-off-by: Andrea Bolognani --- examples/Makefile.am | 11 +++++++++++ libvirt.spec.in | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index ee7d3e6b2c..c7688c7c3d 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -84,6 +84,17 @@ INSTALL_DATA_LOCAL +=3D install-nwfilter-local UNINSTALL_LOCAL +=3D uninstall-nwfilter-local endif WITH_NWFILTER =20 +examplesdir =3D $(docdir)/examples + install-data-local: $(INSTALL_DATA_LOCAL) + $(mkinstalldirs) $(DESTDIR)$(examplesdir) + for p in $(noinst_PROGRAMS); do \ + d=3D$$(dirname $$p); \ + $(mkinstalldirs) $(DESTDIR)$(examplesdir)/$$d; \ + $(INSTALL_DATA) $(srcdir)/$${p}.c $(DESTDIR)$(examplesdir)/$$d/; \ + done =20 uninstall-local: $(UNINSTALL_LOCAL) + for p in $(noinst_PROGRAMS); do \ + rm -f $(DESTDIR)$(examplesdir)/$${p}.c; \ + done diff --git a/libvirt.spec.in b/libvirt.spec.in index ea6a04c02a..5c27a44fc5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1232,8 +1232,6 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) =20 %make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=3D%{_unitdir} V=3D1 =20 -make %{?_smp_mflags} -C examples distclean V=3D1 - rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la @@ -1510,16 +1508,6 @@ exit 0 %doc %{_datadir}/gtk-doc/html/libvirt/*.html %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css -%doc examples/hellolibvirt -%doc examples/object-events -%doc examples/dominfo -%doc examples/domsuspend -%doc examples/dommigrate -%doc examples/openauth -%doc examples/xml -%doc examples/rename -%doc examples/systemtap -%doc examples/admin =20 =20 %files daemon --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list