1From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 15 Feb 2019 11:17:27 +0100
4Subject: [PATCH] Do not write $bindir into pkg-config files
5
6This would otherwise break when using the files to build other target
7components (we need to rely on PATH containing the paths to utilities,
8rather than use target paths).
9
10Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 gio/meson.build  | 16 ++++++++--------
15 glib/meson.build |  6 +++---
16 2 files changed, 11 insertions(+), 11 deletions(-)
17
18diff --git a/gio/meson.build b/gio/meson.build
19index 532b086..98468a3 100644
20--- a/gio/meson.build
21+++ b/gio/meson.build
22@@ -820,14 +820,14 @@ pkg.generate(libgio,
23                'schemasdir=' + join_paths('${datadir}', schemas_subdir),
24                'bindir=' + join_paths('${prefix}', get_option('bindir')),
25                'giomoduledir=' + pkgconfig_giomodulesdir,
26-               'gio=' + join_paths('${bindir}', 'gio'),
27-               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
28-               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
29-               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
30-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
31-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
32-               'gresource=' + join_paths('${bindir}', 'gresource'),
33-               'gsettings=' + join_paths('${bindir}', 'gsettings')],
34+               'gio=gio',
35+               'gio_querymodules=gio-querymodules',
36+               'glib_compile_schemas=glib-compile-schemas',
37+               'glib_compile_resources=glib-compile-resources',
38+               'gdbus=gdbus',
39+               'gdbus_codegen=gdbus-codegen',
40+               'gresource=gresource',
41+               'gsettings=gsettings'],
42   version : glib_version,
43   install_dir : glib_pkgconfigreldir,
44   filebase : 'gio-2.0',
45diff --git a/glib/meson.build b/glib/meson.build
46index aaf5f00..1e0992b 100644
47--- a/glib/meson.build
48+++ b/glib/meson.build
49@@ -375,9 +375,9 @@ pkg.generate(libglib,
50   subdirs : ['glib-2.0'],
51   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
52   variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
53-               'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
54-               'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
55-               'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
56+               'glib_genmarshal=glib-genmarshal',
57+               'gobject_query=gobject-query',
58+               'glib_mkenums=glib-mkenums'],
59   version : glib_version,
60   install_dir : glib_pkgconfigreldir,
61   filebase : 'glib-2.0',
62