From nobody Fri May 3 08:45:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614366877; cv=none; d=zohomail.com; s=zohoarc; b=FG0xVwdEcXhq3ksB/eQmBQPMmKqfqtjEQNxIlSCeCISh8pXmQJ64MoRARwpTz4w8jLHlxWEqy1+Ycx96iuEMi1o8RCL061U0x3b70dvvuyWhl8WZGX018UxzeGT3+wc9JzUXguNF5dDx7HWhbWSLytS9fUce1GqN924NIngNFBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614366877; 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=ynrdynFeG/fv7xBIXdLLzs+qzOZfx95grMjopGawibo=; b=QL0HxAFexl3kpRNV11vnZp1dLQS6w0CY2SiGrtfm1h8D61gW7vRCiJFVWrmMkJj9gF6r9lty/d14w7HX2SJ1/d7X8ZVaFxDmxbuUHfCXSMbMb+zDfLQoN1qnJXdk8vB0SaUH2vP0aWzy9x3VVc6KfOIl6ibmrkTJ7W3XwhS7ORo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614366877460153.15939714289914; Fri, 26 Feb 2021 11:14:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-z2IF05FiPSSKW-EMl1dK5g-1; Fri, 26 Feb 2021 14:14:33 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5535E107ACE6; Fri, 26 Feb 2021 19:14:27 +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 0D277163D5; Fri, 26 Feb 2021 19:14:23 +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 77D8A4E58E; Fri, 26 Feb 2021 19:14:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11QJEIl2031776 for ; Fri, 26 Feb 2021 14:14:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2CC2A1635B0; Fri, 26 Feb 2021 19:14:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26A551635A1 for ; Fri, 26 Feb 2021 19:14:15 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D6829988E3 for ; Fri, 26 Feb 2021 19:14:15 +0000 (UTC) Received: from avasout03.plus.net (avasout03.plus.net [84.93.230.244]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-iAvpgxGGPou6QroH0TnG5w-1; Fri, 26 Feb 2021 14:14:12 -0500 Received: from mailserver ([84.92.36.196]) by smtp with ESMTP id FiW4l8NwOEfgXFiW5lwwDt; Fri, 26 Feb 2021 19:11:11 +0000 X-MC-Unique: z2IF05FiPSSKW-EMl1dK5g-1 X-MC-Unique: iAvpgxGGPou6QroH0TnG5w-1 X-Clacks-Overhead: "GNU Terry Pratchett" X-CM-Score: 0.00 X-CNFS-Analysis: v=2.3 cv=WomwzeXv c=1 sm=1 tr=0 a=9joFju3sQCjqEQe1SErgvA==:117 a=9joFju3sQCjqEQe1SErgvA==:17 a=x7bEGLp0ZPQA:10 a=YbTMELGUhT8A:10 a=pGLkceISAAAA:8 a=4ZvHqYWLKBGggREQyb0A:9 From: Chris Mayo To: libvir-list@redhat.com Subject: [PATCH] meson: Add documentation installation directory option Date: Fri, 26 Feb 2021 19:11:06 +0000 Message-Id: <20210226191106.83176-1-aklhfex@gmail.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfJuZp/wpI2/G9l8IUkIu1DcFg/zUoqrpjtmdPQGiZkdPm6bMMZLumyGvr8av7eaXnGm5pAQ/3HruOqmsc01dIb6hTfaStczB600qphHJi6BsZcb6SZeA 5DvF93HAQkEp/oh9Xh3v1gbnEjtMzxBCXoos/AHUhqMIfrMmhFQQfxhz X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow the directory to be chosen at installation time, to support local conventions e.g. versioning. Signed-off-by: Chris Mayo Reviewed-by: Daniel Henrique Barboza --- meson.build | 6 +++++- meson_options.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 369548f127..5c7a335947 100644 --- a/meson.build +++ b/meson.build @@ -83,8 +83,12 @@ mandir =3D prefix / get_option('mandir') sbindir =3D prefix / get_option('sbindir') sharedstatedir =3D prefix / get_option('sharedstatedir') =20 +docdir =3D get_option('docdir') +if docdir =3D=3D '' + docdir =3D datadir / 'doc' / meson.project_name() +endif + confdir =3D sysconfdir / meson.project_name() -docdir =3D datadir / 'doc' / meson.project_name() pkgdatadir =3D datadir / meson.project_name() =20 =20 diff --git a/meson_options.txt b/meson_options.txt index e5d79c2b6b..2606648b64 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,7 @@ option('expensive_tests', type: 'feature', value: 'auto', d= escription: 'set the option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to i= nclude rpath information in installed binaries and libraries') +option('docdir', type: 'string', value: '', description: 'documentation in= stallation directory') option('docs', type: 'feature', value: 'auto', description: 'whether to ge= nerate documentation') option('tests', type: 'feature', value: 'auto', description: 'whether to b= uild tests') =20 --=20 2.28.0