From patchwork Tue Dec 11 19:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 32 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 881FE60B0C for ; Tue, 11 Dec 2018 20:09:41 +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 659B755A for ; Tue, 11 Dec 2018 20:09:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1544555380; bh=Ixks3SKBqsGQSfh21EodhI4wwwH29F1KEwh1SHuNeWo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Z87NZmyRhtZJTLAxKg5oPQgkaJEuxu8/rFN8BUBNesSs7O2ozoqnGkyaexff75jp/ AAjibh0QKiqaeLqcyd0621p2CNlRbHu9YGm/7CNtyDnxVj6k+xMilIh3Nb1ze5CdST k02wfb09k4Vi0tmiw8+OuXF35wEzb/lMyiVmqY74= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 11 Dec 2018 21:10:07 +0200 Message-Id: <20181211191011.6315-3-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 2/6] Documentation: Set install_dir in custom_target() 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:41 -0000 The custom_target() function accepts an install_dir parameter. Along with setting install to true, this can be used to replace the install_subdir() function. Signed-off-by: Laurent Pinchart --- Documentation/meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index 578c1cae65f5..49e6f3742ffe 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -14,8 +14,7 @@ if sphinx.found() command: [sphinx, '-W', '-b', 'html', meson.current_source_dir(), '@OUTPUT@'], input: docs_sources, output: 'html', - build_by_default: true) - - install_subdir(meson.current_build_dir() + '/html', - install_dir: 'share/doc/libcamera-@0@'.format(api_version)) + build_by_default: true, + install: true, + install_dir: 'share/doc/libcamera-@0@'.format(api_version)) endif