Message ID | 20170915173612.13636-4-luca.boccassi@gmail.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Bruce Richardson |
Headers | show |
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
ci/Intel-compilation | success | Compilation OK |
On Fri, Sep 15, 2017 at 06:36:12PM +0100, luca.boccassi@gmail.com wrote: > 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> > --- Acked-by: Bruce Richardson <bruce.richardson@intel.com>
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',