From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 19 Jul 2019 13:32:57 -0400 Subject: [PATCH] build: Fix path handling in pkgconfig --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 36913b3f04..161b378ba5 100644 --- a/meson.build +++ b/meson.build @@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', # pkg-config files - bit of a mess all of this pkgconf = configuration_data() -pkgconf.set('prefix', get_option('prefix')) +pkgconf.set('prefix', gtk_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('libdir', gtk_libdir) +pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) pkgconf.set('GTK_API_VERSION', gtk_api_version) pkgconf.set('VERSION', meson.project_version()) pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) -- 2.22.0