On Tue, Oct 02, 2018 at 02:06:46PM +0100, Luca Boccassi wrote:
> Allow users and packagers to override the default dpdk/drivers
> subdirectory where the PMDs get installed under $lib.
>
> Signed-off-by: Luca Boccassi <bl...@debian.org>
> ---
> meson.build | 10 ++++++++--
> meson_options.txt | 2 ++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 4bd04b9de3..9f7f17f7fe 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -20,8 +20,14 @@ dpdk_extra_ldflags = []
> pver = meson.project_version().split('.')
> major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
>
> -driver_install_path = join_paths(get_option('libdir'), 'dpdk',
> - 'pmds-' + major_version)
> +pmd_subdir_opt = get_option('drivers_install_subdir')
> +if pmd_subdir_opt == 'dpdk/pmds-XX.YY'
> + driver_install_path = join_paths(get_option('libdir'),
> + 'dpdk', 'pmds-' + major_version)
> +else
> + driver_install_path = join_paths(get_option('libdir'),
> + pmd_subdir_opt)
> +endif
Not sure I like this degree of hard-coding of paths. While meson doesn't
have a string replace function, we can still use "sed" via run_command to
perform some substitution, or else get a little creative using split if it
can be made work. That would allow us to put in e.g "<VERSION>" as a
generic placeholder in the text.
/Bruce
