From a4c9049486868f9a08c74e745733a502b9ca9071 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 7 Oct 2021 17:03:28 +0100 Subject: [PATCH] =?UTF-8?q?build:=20Don=E2=80=99t=20pass=20false=20to=20`i?= =?UTF-8?q?nstall=5Fdir`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a Meson deprecation warning which appeared in Meson 0.50. Signed-off-by: Philip Withnall --- glib/meson.build | 12 ++++++++---- gobject/meson.build | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/glib/meson.build b/glib/meson.build index 93600b29e..ba7929da4 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -448,19 +448,23 @@ gdb_conf = configuration_data() gdb_conf.set('datadir', glib_datadir) # This is also used in gobject/meson.build if host_system != 'windows' - # 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) + gdb_install = true else # FIXME: Cannot install on Windows because the path will contain a drive # letter and colons are not allowed in paths. - gdb_install_dir = false + gdb_install = false 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( input: 'libglib-gdb.py.in', output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), configuration: gdb_conf, install_dir: gdb_install_dir, + install: gdb_install, ) if enable_systemtap diff --git a/gobject/meson.build b/gobject/meson.build index 536f15393..7e5150e6c 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -159,6 +159,7 @@ configure_file( output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), configuration: gdb_conf, install_dir: gdb_install_dir, + install: gdb_install, ) if enable_systemtap