diff --git a/gio/meson.build b/gio/meson.build index 24d44989d..1f7c1092d 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -877,7 +877,9 @@ libgio_dep = declare_dependency(link_with : libgio, pkg.generate(libgio, requires : ['glib-2.0', 'gobject-2.0'], - variables : ['schemasdir=' + join_paths('${datadir}', schemas_subdir), + variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), + 'schemasdir=' + join_paths('${datadir}', schemas_subdir), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build index fef346e2f..4130b1ba6 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -438,7 +438,8 @@ pkg.generate(libglib, libraries_private : [win32_ldflags], subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), + 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')], version : glib_version,