From 0797a40627a4cb5439a24b872edc65356dceaaf0 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 532b086..98468a3 100644
|
--- a/gio/meson.build
|
+++ b/gio/meson.build
|
@@ -820,14 +820,14 @@ pkg.generate(libgio,
|
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
|
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
'giomoduledir=' + pkgconfig_giomodulesdir,
|
- 'gio=' + join_paths('${bindir}', 'gio'),
|
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
|
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
|
- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
|
- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
|
- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
|
- 'gresource=' + join_paths('${bindir}', 'gresource'),
|
- 'gsettings=' + join_paths('${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,
|
filebase : 'gio-2.0',
|
diff --git a/glib/meson.build b/glib/meson.build
|
index aaf5f00..1e0992b 100644
|
--- a/glib/meson.build
|
+++ b/glib/meson.build
|
@@ -375,9 +375,9 @@ pkg.generate(libglib,
|
subdirs : ['glib-2.0'],
|
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
|
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
|
- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
|
- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
|
- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
|
+ 'glib_genmarshal=glib-genmarshal',
|
+ 'gobject_query=gobject-query',
|
+ 'glib_mkenums=glib-mkenums'],
|
version : glib_version,
|
install_dir : glib_pkgconfigreldir,
|
filebase : 'glib-2.0',
|
