[Mesa-dev] [PATCH] meson: fix the install path of amdgpu.ids

[Dylan Baker]

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

I'll go ahead and push this.

Quoting Christoph Haag (2018-01-18 10:01:55)
> ---
>  amdgpu/meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/amdgpu/meson.build b/amdgpu/meson.build
> index 55ab9d1d..8b045205 100644
> --- a/amdgpu/meson.build
> +++ b/amdgpu/meson.build
> @@ -19,7 +19,7 @@
>  # SOFTWARE.
>  
>  
> -datadir_amdgpu = join_paths(get_option('datadir'), 'libdrm', 'amdgpu.ids')
> +datadir_amdgpu = join_paths(get_option('prefix'), get_option('datadir'), 'libdrm')
>  
>  libdrm_amdgpu = shared_library(
>    'drm_amdgpu',
> @@ -33,7 +33,7 @@ libdrm_amdgpu = shared_library(
>    ],
>    c_args : [
>      warn_c_args,
> -    '-DAMDGPU_ASIC_ID_TABLE="@0@"'.format(datadir_amdgpu),
> +    '-DAMDGPU_ASIC_ID_TABLE="@0@"'.format(join_paths(datadir_amdgpu, 'amdgpu.ids')),
>    ],
>    include_directories : [inc_root, inc_drm],
>    link_with : libdrm,
> -- 
> 2.16.0
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 484 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180118/d4ca2bee/attachment.sig>