[glib] meson: Fix GDB scripts install_dir for *nix
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] meson: Fix GDB scripts install_dir for *nix
- Date: Thu, 2 Nov 2017 04:28:38 +0000 (UTC)
commit 430e2dd3f54734cfa87d6643f2370604abcf959d
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date: Tue Oct 24 16:29:49 2017 +0200
meson: Fix GDB scripts install_dir for *nix
Disable installation on Windows for now as this would use a colon in the
directory name.
https://bugzilla.gnome.org/show_bug.cgi?id=788772
glib/meson.build | 5 +++--
gobject/meson.build | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/glib/meson.build b/glib/meson.build
index 1da0bcd..33ece2d 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -283,8 +283,9 @@ configure_file(
input: 'libglib-gdb.py.in',
output: 'libglib-2.0.so.@0 -gdb py'.format(library_version),
configuration: gdb_conf,
- install: true,
- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir'))
+ # FIXME: Figure out how to install this on Windows
+ install: host_system != 'windows',
+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
)
if enable_systemtap
diff --git a/gobject/meson.build b/gobject/meson.build
index 5a8289e..0c8c0cb 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -100,8 +100,9 @@ configure_file(
input: 'libgobject-gdb.py.in',
output: 'libgobject-2.0.so.@0 -gdb py'.format(library_version),
configuration: gdb_conf,
- install: true,
- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir'))
+ # FIXME: Figure out how to install this on Windows
+ install: host_system != 'windows',
+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
)
if enable_systemtap
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]