diff mbox series

[v4,1/4] examples: fix flattening directory layout on install

Message ID 20201112094142.1781861-2-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series improve examples installation | expand


Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Bruce Richardson Nov. 12, 2020, 9:41 a.m. UTC
By installing the examples one-by-one in a loop in the examples
meson.build file we effectively flattened out the structure of the examples
folder and omitted some common and shared subfolders that were never
directly built.  Instead, we can remove the loop and just have the whole
"examples" folder installed as-is in a single statement, preserving its
directory structure, and thereby fixing the build of a number of the

Fixes: 2daf565f91b5 ("examples: install as part of ninja install")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
 examples/meson.build | 7 -------
 meson.build          | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)
diff mbox series


diff --git a/examples/meson.build b/examples/meson.build
index f17995532..46ec80919 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -47,13 +47,6 @@  all_examples = [
 	'vmdq', 'vmdq_dcb',
-# install all example code on install - irrespective of whether the example in
-# question is to be built as part of this build or not.
-foreach ex:all_examples
-	install_subdir(ex,
-			install_dir: get_option('datadir') + '/dpdk/examples',
-			exclude_files: 'meson.build')
 if get_option('examples') == ''
diff --git a/meson.build b/meson.build
index 61d9a4f5f..45d974cd2 100644
--- a/meson.build
+++ b/meson.build
@@ -59,6 +59,9 @@  subdir('doc')
 # build any examples explicitly requested - useful for developers - and
 # install any example code into the appropriate install path
+	install_dir: get_option('datadir') + '/dpdk',
+	exclude_files: 'meson.build')
 # build kernel modules if enabled
 if get_option('enable_kmods')