From 73588cc57f880dcd81f77ae1b00755aa61a182a0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 18:36:12 +0100 Subject: [PATCH] eal: do not hard-code install path with meson 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/common/include/meson.build | 2 +- lib/librte_eal/linuxapp/eal/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/include/meson.build b/lib/librte_eal/common/include/meson.build index f7566effb3..5ba00c800c 100644 --- a/lib/librte_eal/common/include/meson.build +++ b/lib/librte_eal/common/include/meson.build @@ -67,6 +67,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 d4cdf3f394..d4be55714d 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', '../../../librte_compat') -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.20.1