DPDK patches and discussions
 help / color / mirror / Atom feed
From: luca.boccassi@gmail.com
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, Luca Boccassi <bluca@debian.org>
Subject: [dpdk-dev] [PATCH 3/3] build: don't hard-code generic/exec-env install path
Date: Fri, 15 Sep 2017 18:36:12 +0100	[thread overview]
Message-ID: <20170915173612.13636-4-luca.boccassi@gmail.com> (raw)
In-Reply-To: <20170915173612.13636-1-luca.boccassi@gmail.com>

From: Luca Boccassi <bluca@debian.org>

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 <bluca@debian.org>
---
 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

  parent reply	other threads:[~2017-09-15 17:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-15 17:36 [dpdk-dev] [PATCH 0/3] meson: compatibility with Debian/Ubuntu luca.boccassi
2017-09-15 17:36 ` [dpdk-dev] [PATCH 1/3] build: rename pkgconfig to libdpdk.pc luca.boccassi
2017-09-18 11:09   ` Bruce Richardson
2017-09-18 11:52     ` Luca Boccassi
2017-09-15 17:36 ` [dpdk-dev] [PATCH 2/3] build: add optional arch-specific headers install path luca.boccassi
2017-09-18 11:27   ` Bruce Richardson
2017-09-15 17:36 ` luca.boccassi [this message]
2017-09-18 11:28   ` [dpdk-dev] [PATCH 3/3] build: don't hard-code generic/exec-env " Bruce Richardson
2017-09-18 11:29 ` [dpdk-dev] [PATCH 0/3] meson: compatibility with Debian/Ubuntu Bruce Richardson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170915173612.13636-4-luca.boccassi@gmail.com \
    --to=luca.boccassi@gmail.com \
    --cc=bluca@debian.org \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).