From mboxrd@z Thu Jan 1 00:00:00 1970 From: luca.boccassi@gmail.com Subject: [PATCH 3/3] build: don't hard-code generic/exec-env install path Date: Fri, 15 Sep 2017 18:36:12 +0100 Message-ID: <20170915173612.13636-4-luca.boccassi@gmail.com> References: <20170915173612.13636-1-luca.boccassi@gmail.com> Cc: bruce.richardson@intel.com, Luca Boccassi To: dev@dpdk.org Return-path: 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) In-Reply-To: <20170915173612.13636-1-luca.boccassi@gmail.com> 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 --- 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', -- 2.11.0