mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 01:06:15 +02:00
build: Don’t pass false to install_dir
This fixes a Meson deprecation warning which appeared in Meson 0.50. Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
parent
e728278f83
commit
a4c9049486
@ -448,19 +448,23 @@ gdb_conf = configuration_data()
|
|||||||
gdb_conf.set('datadir', glib_datadir)
|
gdb_conf.set('datadir', glib_datadir)
|
||||||
# This is also used in gobject/meson.build
|
# This is also used in gobject/meson.build
|
||||||
if host_system != 'windows'
|
if host_system != 'windows'
|
||||||
# XXX: We add a leading './' because glib_libdir is an absolute path and we
|
gdb_install = true
|
||||||
# need it to be a relative path so that join_paths appends it to the end.
|
|
||||||
gdb_install_dir = join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
|
|
||||||
else
|
else
|
||||||
# FIXME: Cannot install on Windows because the path will contain a drive
|
# FIXME: Cannot install on Windows because the path will contain a drive
|
||||||
# letter and colons are not allowed in paths.
|
# letter and colons are not allowed in paths.
|
||||||
gdb_install_dir = false
|
gdb_install = false
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# XXX: We add a leading './' because glib_libdir is an absolute path and we
|
||||||
|
# need it to be a relative path so that join_paths appends it to the end.
|
||||||
|
gdb_install_dir = join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'libglib-gdb.py.in',
|
input: 'libglib-gdb.py.in',
|
||||||
output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
|
output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
|
||||||
configuration: gdb_conf,
|
configuration: gdb_conf,
|
||||||
install_dir: gdb_install_dir,
|
install_dir: gdb_install_dir,
|
||||||
|
install: gdb_install,
|
||||||
)
|
)
|
||||||
|
|
||||||
if enable_systemtap
|
if enable_systemtap
|
||||||
|
@ -159,6 +159,7 @@ configure_file(
|
|||||||
output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version),
|
output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version),
|
||||||
configuration: gdb_conf,
|
configuration: gdb_conf,
|
||||||
install_dir: gdb_install_dir,
|
install_dir: gdb_install_dir,
|
||||||
|
install: gdb_install,
|
||||||
)
|
)
|
||||||
|
|
||||||
if enable_systemtap
|
if enable_systemtap
|
||||||
|
Loading…
Reference in New Issue
Block a user