mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
build: Drop pkgconfig.generate variables for builtin directories
Meson has added these automatically since 0.62. This fixes a Meson warning. Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
This commit is contained in:
parent
4ce58df854
commit
7fd9045065
@ -883,10 +883,8 @@ libgio_dep = declare_dependency(link_with : libgio,
|
||||
pkg.generate(libgio,
|
||||
requires : ['glib-2.0', 'gobject-2.0'],
|
||||
variables : [
|
||||
'datadir=' + '${prefix}' / get_option('datadir'),
|
||||
'schemasdir=' + '${datadir}' / schemas_subdir,
|
||||
'dtdsdir=' + '${datadir}' / dtds_subdir,
|
||||
'bindir=' + '${prefix}' / get_option('bindir'),
|
||||
'giomoduledir=' + pkgconfig_giomodulesdir,
|
||||
'gio=' + '${bindir}' / 'gio',
|
||||
'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
|
||||
|
@ -445,8 +445,6 @@ pkg.generate(libglib,
|
||||
subdirs : ['glib-2.0'],
|
||||
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
|
||||
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',
|
||||
|
Loading…
Reference in New Issue
Block a user