diff options
| author | Andreas Cord-Landwehr <cordlandwehr@kde.org> | 2022-09-24 16:47:46 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2024-01-19 15:18:23 +0000 |
| commit | 8c49ee311245cbe615061e5a20a5e11648be324f (patch) | |
| tree | 996257f6045c400e59b8bedf130773791c6e7d33 /src | |
| parent | shm: implement version 2 (diff) | |
| download | wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar.gz wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar.bz2 wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar.lz wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar.xz wayland-8c49ee311245cbe615061e5a20a5e11648be324f.tar.zst wayland-8c49ee311245cbe615061e5a20a5e11648be324f.zip | |
Consider pkgconfig sysroot for pkgdatadir
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/meson.build b/src/meson.build index 9e61f3d..5d04334 100644 --- a/src/meson.build +++ b/src/meson.build @@ -65,7 +65,7 @@ if get_option('scanner') version: meson.project_version(), variables: [ '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')), 'wayland_scanner=${bindir}/wayland-scanner' ], @@ -214,7 +214,7 @@ if get_option('libraries') filebase: 'wayland-server', variables: [ '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', variables: [ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) + 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) ] ) |