X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=meson.build;h=c1cbdfed24ec22470b3a3fc00e6b3b2d547f3222;hb=d7939c5f877e017c8b3c3f3bfb85f7583cd3ac5b;hp=8ee78c5ed4b6aee4cdbc9f2c4c6084701e347810;hpb=16ade738fd0dea69da2e35019acc66ab17366fdc;p=dpdk.git

diff --git a/meson.build b/meson.build
index 8ee78c5ed4..c1cbdfed24 100644
--- a/meson.build
+++ b/meson.build
@@ -64,14 +64,16 @@ subdir('lib')
 subdir('buildtools')
 subdir('drivers')
 
-# build binaries and (TODO) 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
@@ -82,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)]
 )