[glib] meson: Fix installation of gdb autoload scripts v2
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] meson: Fix installation of gdb autoload scripts v2
- Date: Thu, 2 Nov 2017 04:53:24 +0000 (UTC)
commit 953a51d97bc07418fb9d1a5f3a5336d3c9022793
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Thu Nov 2 10:22:39 2017 +0530
meson: Fix installation of gdb autoload scripts v2
`install:` is not a valid keyword argument for configure_file()
glib/meson.build | 17 +++++++++++------
gobject/meson.build | 7 +------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/glib/meson.build b/glib/meson.build
index debfee2..223b7fe 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -279,16 +279,21 @@ install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
gdb_conf = configuration_data()
gdb_conf.set('datadir', glib_datadir)
-configure_file(
- input: 'libglib-gdb.py.in',
- output: 'libglib-2.0.so.@0 -gdb py'.format(library_version),
- configuration: gdb_conf,
+# 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.
- install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ gdb_install_dir = join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+else
# FIXME: Cannot install on Windows because the path will contain a drive
# letter and colons are not allowed in paths.
- install: host_system != 'windows',
+ gdb_install_dir = false
+endif
+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,
)
if enable_systemtap
diff --git a/gobject/meson.build b/gobject/meson.build
index dedc9fb..4a392c2 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -100,12 +100,7 @@ configure_file(
input: 'libgobject-gdb.py.in',
output: 'libgobject-2.0.so.@0 -gdb py'.format(library_version),
configuration: gdb_conf,
- # 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.
- install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
- # FIXME: Cannot install on Windows because the path will contain a drive
- # letter and colons are not allowed in paths.
- install: host_system != 'windows',
+ install_dir: gdb_install_dir,
)
if enable_systemtap
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]