From nobody Mon Feb 9 08:28:29 2026 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