| From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001 |
| From: Andreas Cord-Landwehr <cordlandwehr@kde.org> |
| Date: Sun, 6 Feb 2022 17:23:46 +0100 |
| Subject: [PATCH] Consider pkgconfig sysroot for pkgdatadir |
| |
| For libs/cflags this is done automatically, but not for manually accessed |
| variables. This matches what wayland-protocols does. |
| |
| Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/272] |
| --- |
| src/meson.build | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/src/meson.build b/src/meson.build |
| index a8a1d2b..721e151 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' |
| ], |
| @@ -211,7 +211,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()) |
| ] |
| ) |
| |
| @@ -250,7 +250,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()) |
| ] |
| ) |
| |
| -- |
| 2.37.2 |