While the examples were being installed into the appropriate install path
when processing the examples/meson.build file, that file was only processed
if the "examples" meson parameter was non-empty. Since we now do more than
just build the examples, we need to unconditionally process the file.
Fixes: 2daf565f91b5 ("examples: install as part of ninja install")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
examples/meson.build | 4 ++++
meson.build | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/examples/meson.build b/examples/meson.build
index 1a6134f12..1995f4dcb 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -19,6 +19,10 @@ foreach ex:all_examples
exclude_files: 'meson.build')
endforeach
+if get_option('examples') == ''
+ subdir_done()
+endif
+
if get_option('examples').to_lower() == 'all'
examples = all_examples
allow_skips = true # don't flag an error if we can't build an app
diff --git a/meson.build b/meson.build
index 46f9c5683..9cad43481 100644
--- a/meson.build
+++ b/meson.build
@@ -42,10 +42,9 @@ subdir('app')
# build docs
subdir('doc')
-# build any examples explicitly requested - useful for developers
-if get_option('examples') != ''
- subdir('examples')
-endif
+# build any examples explicitly requested - useful for developers - and
+# install any example code into the appropriate install path
+subdir('examples')
# build kernel modules if enabled
if get_option('enable_kmods')
--
2.21.0
