From 6a0ace2b192bd0e3b6c9bb465685280c5e85db8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MrSm=C3=B6r?= <66489839+MrSmoer@users.noreply.github.com> Date: Mon, 7 Jul 2025 01:28:30 +0200 Subject: [PATCH] Make meson generate a proper pkg-config file when absolute paths (#298) are specified for includedir and libdir etc. modified: meson.build --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 6fa253f7..b6dc2370 100644 --- a/meson.build +++ b/meson.build @@ -254,9 +254,9 @@ pkgconf = configuration_data() pkgconf.set('prefix', get_option('prefix')) pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -pkgconf.set('pkgincludedir', '${prefix}/@0@'.format(get_option('includedir')) + '/libdwarf') +pkgconf.set('libdir', join_paths('${prefix}','@0@'.format(get_option('libdir')))) +pkgconf.set('includedir', join_paths('${prefix}','@0@'.format(get_option('includedir')))) +pkgconf.set('pkgincludedir', join_paths('${prefix}','@0@'.format(get_option('includedir')),'/libdwarf')) pkgconf.set('VMAJ', v_maj) pkgconf.set('PACKAGE_VERSION', meson.project_version()) pkgconf.set('PROJECT_VERSION', meson.project_version())