From patchwork Tue Dec 11 19:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 33 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B55960B0C for ; Tue, 11 Dec 2018 20:09:42 +0100 (CET) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A93EF55A for ; Tue, 11 Dec 2018 20:09:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1544555382; bh=yv4jJHB4a/WAXd5zOQZZfw4IufVnuFNZwjwgu+ClYCk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dEHaGQoTLW082XMbwm4HV4/32YPa9iIj8KsvGFjAsWL5xqGFjeoK0XMSOMPfBJgkj cnf2WSRw+CnWLBXikLa6XAJ1lqGZd7IUwfGSiJ+RuNP5jZrma3Pw/eP9QLCqNaZA34 2Pdh4bjVNN6MFTzMEwN37LwDaW48tQ4a5Ms61Eoo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 11 Dec 2018 21:10:08 +0200 Message-Id: <20181211191011.6315-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211191011.6315-1-laurent.pinchart@ideasonboard.com> References: <20181211191011.6315-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/6] Documentation: Don't hardcode install directory X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2018 19:09:42 -0000 Use the datadir option to select the directory in which to install documentation. This defaults to $prefix/share so this doesn't introduce any change in the default case. While at is use join_paths() to join patch components instead of hardcoding the / separator. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- Documentation/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 49e6f3742ffe..57c3fdcf7cc7 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -1,3 +1,5 @@ +doc_install_dir = join_paths(get_option('datadir'), 'doc', 'libcamera-@0@'.format(api_version)) + sphinx = find_program('sphinx-build-3', required: false) if not sphinx.found() sphinx = find_program('sphinx-build', required: false) @@ -16,5 +18,5 @@ if sphinx.found() output: 'html', build_by_default: true, install: true, - install_dir: 'share/doc/libcamera-@0@'.format(api_version)) + install_dir: doc_install_dir) endif