From e7077aa23bfcd31a8e72e39dc93ce4f854678376 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files

This would otherwise break when using the files to build other target
components (we need to rely on PATH containing the paths to utilities,
rather than use target paths).

Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 gio/meson.build  | 16 ++++++++--------
 glib/meson.build |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gio/meson.build b/gio/meson.build
index 5f91586..1a95f4f 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -884,14 +884,14 @@ pkg.generate(libgio,
     'dtdsdir=' + '${datadir}' / dtds_subdir,
     'bindir=' + '${prefix}' / get_option('bindir'),
     'giomoduledir=' + pkgconfig_giomodulesdir,
-    'gio=' + '${bindir}' / 'gio',
-    'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
-    'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas',
-    'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources',
-    'gdbus=' + '${bindir}' /'gdbus',
-    'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen',
-    'gresource=' + '${bindir}' / 'gresource',
-    'gsettings=' + '${bindir}' / 'gsettings',
+    'gio=gio',
+    'gio_querymodules=gio-querymodules',
+    'glib_compile_schemas=glib-compile-schemas',
+    'glib_compile_resources=glib-compile-resources',
+    'gdbus=gdbus',
+    'gdbus_codegen=gdbus-codegen',
+    'gresource=gresource',
+    'gsettings=gsettings',
   ],
   version : glib_version,
   install_dir : glib_pkgconfigreldir,
diff --git a/glib/meson.build b/glib/meson.build
index c26a35e..1d8ca6b 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -447,9 +447,9 @@ pkg.generate(libglib,
   variables : [
     'bindir=' + '${prefix}' / get_option('bindir'),
     'datadir=' + '${prefix}' / get_option('datadir'),
-    'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
-    'gobject_query=' + '${bindir}' / 'gobject-query',
-    'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
+    'glib_genmarshal=glib-genmarshal',
+    'gobject_query=gobject-query',
+    'glib_mkenums=glib-mkenums',
     'glib_valgrind_suppressions=' + '${datadir}' /
       valgrind_suppression_file_install_subdir /
       fs.name(valgrind_suppression_file),
