From patchwork Mon Nov 23 16:43:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10476 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 53EC9BE08A for ; Mon, 23 Nov 2020 16:45:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 136BA6340C; Mon, 23 Nov 2020 17:45:04 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gumwg+zy"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7872C633F2 for ; Mon, 23 Nov 2020 17:44:59 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 21DFE71; Mon, 23 Nov 2020 17:44:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1606149899; bh=Ohi7DMLd0Tf9EdGfdkQfO12SvSLQ1dK/ovx3NnXDAiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gumwg+zyvy2pnConvB6wObTDeZ1K/83CBu6/64cAAOWEACxfYnCKXT9qUUza1d3+Z RQUGWfwn39hNpT+IfR4XJTwWWF+/CIqVSVcpm/hR7/rW1XoHzQr/YmDntLZKeaE9ND LukIVoteZlzUWb+BZr5SAtCaz1vnsfwKwucZ5drM= From: Kieran Bingham To: libcamera devel Date: Mon, 23 Nov 2020 16:43:16 +0000 Message-Id: <20201123164319.152742-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> References: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 5/8] src: ipa: meson: Re-use existing system paths X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Make use of the new system path variables and map the ipa paths upon the libcamera system paths. While we're at it, make use of the new shorter syntax for join_paths(). Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- src/ipa/meson.build | 16 +++++++--------- src/meson.build | 2 ++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 5a5de267c147..c1dc1ce6fa90 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -1,19 +1,17 @@ # SPDX-License-Identifier: CC0-1.0 -ipa_install_dir = join_paths(get_option('libdir'), 'libcamera') -ipa_data_dir = join_paths(get_option('datadir'), 'libcamera', 'ipa') -ipa_sysconf_dir = join_paths(get_option('sysconfdir'), 'libcamera', 'ipa') - ipa_includes = [ libcamera_includes, ] -config_h.set('IPA_CONFIG_DIR', - '"' + join_paths(get_option('prefix'), ipa_sysconf_dir) + - ':' + join_paths(get_option('prefix'), ipa_data_dir) + '"') +ipa_install_dir = libcamera_libdir +ipa_data_dir = libcamera_datadir / 'ipa' +ipa_sysconf_dir = libcamera_sysconfdir / 'ipa' + +config_h.set('IPA_CONFIG_DIR', '"' + prefix / ipa_sysconf_dir + + ':' + prefix / ipa_data_dir + '"') -config_h.set('IPA_MODULE_DIR', - '"' + join_paths(get_option('prefix'), ipa_install_dir) + '"') +config_h.set('IPA_MODULE_DIR', '"' + prefix / ipa_install_dir + '"') subdir('libipa') diff --git a/src/meson.build b/src/meson.build index b1b3514f6ed7..c7430805fd86 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,10 +2,12 @@ # Handle system paths datadir = get_option('datadir') +libdir = get_option('libdir') prefix = get_option('prefix') sysconfdir = get_option('sysconfdir') libcamera_datadir = datadir / 'libcamera' +libcamera_libdir = libdir / 'libcamera' libcamera_sysconfdir = sysconfdir / 'libcamera' config_h.set('LIBCAMERA_SYSCONF_DIR', '"' + prefix / libcamera_sysconfdir + '"')