From patchwork Fri Sep 15 17:36:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 28769 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 496697CCD; Fri, 15 Sep 2017 19:36:44 +0200 (CEST) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id AF95B3238 for ; Fri, 15 Sep 2017 19:36:42 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id f4so3365307wmh.4 for ; Fri, 15 Sep 2017 10:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FuNDHmHmMTGtGu1cmQmfCbJFUzVZwPhlNMJkV+ayXsI=; b=rP8JPWbpDhzszQx2NOerZV0Scu4pShHPi+iBAm1Fa9bMER0w7WFV1nDKTYDnW0Q0+9 Br5kuqOfAjIXAAtLGVhT9Hq9Dlgev0tuSU0+q1YIi3mtsY+59hWkSQBGdr2jjXvB62AO Kgjf58yq9PqQPj+sfIS15dOaBODUg9Y6JpWJYFaWF5VRGDA8ws6V1PsEdhfzYWxkmAO5 vvbW+Jd6SpUGTWBA2Ypl2EIdNAKIGamqI2kDJ37/Nysc/jfZwpvY8ToVbjDgmTD2Mh5v DHWv3SOkbciech/IQ0P4PN8PFxiitHq9iojBtAY17RRPDnQge34QWr3r8Iq1b1iowR8D vTUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FuNDHmHmMTGtGu1cmQmfCbJFUzVZwPhlNMJkV+ayXsI=; b=B5JHE3Hk75sFSE+p4oq9+McJAdQHp/DGDuqs1qRqJmfcqjNnRKIS3mltI76nIL8G+s AqsekMVVbzyadvBW1QpOCd2lgd7Q8gU9vqDuHG6kybDpcxhXfJuCp61PPDoS6bJi2GH5 Sklh0OUfUm6ExiBC1m+ctvcfSLmMvZCF6MGX3r6o318Q1MSHwEuDdcCFU03+6GD1wOSa p06Sx+13/1VqISUUp0q3Ug4UfgVlVDyCShSKGQ1+kNCdt12eycIPai3jjK5Ufs/J+gN4 Wv3luHww35VtIEIuFgApqmwjtRnfOkmonW7HQ1+HwPkC+LtLyMi04hlKQvJ2QtA57YiF 0C3w== X-Gm-Message-State: AHPjjUiiJajwcLZtuceMVVEf1v2L3CG617aWPmyOqCP4h8aL3r0WK8qA jbDU84dAKhKqxt5YdDzVyaGzjsUJ X-Google-Smtp-Source: AOwi7QA543ry5GUsewFocDkM6hE+WvPzBAcrfWaVEW+3q30pfmzjrv7mqLdytUImd9xR4Y4VgDOSHQ== X-Received: by 10.28.236.194 with SMTP id h63mr3718627wmi.159.1505497002074; Fri, 15 Sep 2017 10:36:42 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id 55sm1961810wrw.60.2017.09.15.10.36.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2017 10:36:41 -0700 (PDT) From: luca.boccassi@gmail.com To: dev@dpdk.org Cc: bruce.richardson@intel.com, Luca Boccassi Date: Fri, 15 Sep 2017 18:36:12 +0100 Message-Id: <20170915173612.13636-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170915173612.13636-1-luca.boccassi@gmail.com> References: <20170915173612.13636-1-luca.boccassi@gmail.com> Subject: [dpdk-dev] [PATCH 3/3] build: don't hard-code generic/exec-env install path X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Luca Boccassi Instead of hard-coding the install path of generic and exec-env headers use the includedir option, so that it can be correctly overridden. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- lib/librte_eal/bsdapp/eal/meson.build | 2 +- lib/librte_eal/common/include/meson.build | 2 +- lib/librte_eal/linuxapp/eal/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/meson.build b/lib/librte_eal/bsdapp/eal/meson.build index f6c43fd44..5116f8dab 100644 --- a/lib/librte_eal/bsdapp/eal/meson.build +++ b/lib/librte_eal/bsdapp/eal/meson.build @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. eal_inc += include_directories('include') -install_subdir('include/exec-env', install_dir: 'include') +install_subdir('include/exec-env', install_dir: get_option('includedir')) sources = ['eal_alarm.c', 'eal_debug.c', diff --git a/lib/librte_eal/common/include/meson.build b/lib/librte_eal/common/include/meson.build index d106d1a46..bb9751065 100644 --- a/lib/librte_eal/common/include/meson.build +++ b/lib/librte_eal/common/include/meson.build @@ -66,6 +66,6 @@ common_headers = [ 'rte_version.h'] install_headers(common_headers) -install_subdir('generic', install_dir : 'include') +install_subdir('generic', install_dir : get_option('includedir')) subdir('arch') diff --git a/lib/librte_eal/linuxapp/eal/meson.build b/lib/librte_eal/linuxapp/eal/meson.build index bffbd7e66..46ae57649 100644 --- a/lib/librte_eal/linuxapp/eal/meson.build +++ b/lib/librte_eal/linuxapp/eal/meson.build @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. eal_inc += include_directories('include') -install_subdir('include/exec-env', install_dir: 'include') +install_subdir('include/exec-env', install_dir: get_option('includedir')) sources = ['eal_alarm.c', 'eal_debug.c',