build: add optional arch-specific headers install path

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 27c5e38..c1cbdfe 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -64,13 +64,16 @@ subdir('lib')
 subdir('buildtools')
 subdir('drivers')
 
-# TODO build binaries and installable tools
+# build binaries and installable tools
+subdir('usertools')
+subdir('app')
 
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
                configuration: dpdk_conf,
-               install_dir: get_option('includedir'))
+               install_dir: join_paths(get_option('includedir'),
+                               get_option('include_subdir_arch')))
 
 # for static builds, include the drivers as libs, and also any
 # other dependent libs that DPDK needs to link against
@@ -81,8 +84,10 @@ endif
 
 pkg = import('pkgconfig')
 pkg.generate(name: meson.project_name(),
+       filebase: 'lib' + meson.project_name().to_lower(),
        version: meson.project_version(),
        libraries: dpdk_libraries,
        description: 'The Data Plane Development Kit (DPDK)',
+       subdirs: [get_option('include_subdir_arch'), '.'],
        extra_cflags: ['-include', 'rte_config.h', '-march=@0@'.format(machine)]
 )