[dpdk-stable] [PATCH] install: fix flattening of examples directory

[Bruce Richardson]

Using correct address for David. :-(

On Tue, Nov 10, 2020 at 05:08:09PM +0000, Bruce Richardson wrote:
> By installing the examples one-by-one in a loop in the examples
> meson.build file we effectively flatted 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
> examples.
> 
> Fixes: 2daf565f91b5 ("examples: install as part of ninja install")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
> ---
>  examples/meson.build | 7 -------
>  meson.build          | 3 +++
>  2 files changed, 3 insertions(+), 7 deletions(-)
> 
> 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 = [
>  	'vm_power_manager/guest_cli',
>  	'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')
> -endforeach
>  
>  if get_option('examples') == ''
>  	subdir_done()
> 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
>  subdir('examples')
> +install_subdir('examples',
> +	install_dir: get_option('datadir') + '/dpdk',
> +	exclude_files: 'meson.build')
>  
>  # build kernel modules if enabled
>  if get_option('enable_kmods')
> -- 
> 2.25.1
>