mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consider pkgconfig sysroot for pkgdatadir

Browse source 
For libs/cflags this is done automatically, but not for manually accessed
variables. This matches what wayland-protocols does.

Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
This commit is contained in:
Andreas Cord-Landwehr 2022-09-24 16:47:46 +02:00 • committed by Daniel Stone
parent fd42f70baf
commit 8c49ee3112
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/meson.build
View file

@ -65,7 +65,7 @@ if get_option('scanner')
version: meson.project_version(), version: meson.project_version(),
variables: [ variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')), 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
'bindir=' + join_paths('${prefix}', get_option('bindir')), 'bindir=' + join_paths('${prefix}', get_option('bindir')),
'wayland_scanner=${bindir}/wayland-scanner' 'wayland_scanner=${bindir}/wayland-scanner'
], ],
@ -214,7 +214,7 @@ if get_option('libraries')
filebase: 'wayland-server', filebase: 'wayland-server',
variables: [ variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')), 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
] ]
) )
@ -253,7 +253,7 @@ if get_option('libraries')
filebase: 'wayland-client', filebase: 'wayland-client',
variables: [ variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')), 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
] ]
) )