luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Fix installation of gdb autoload scripts v2

Browse Source 
`install:` is not a valid keyword argument for configure_file()
This commit is contained in:
Nirbheek Chauhan 2017-11-02 10:22:39 +05:30
parent 625bfa0b36
commit 953a51d97b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glib/meson.build
View File

@ -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)
# 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)
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
endif
configure_file(
input: 'libglib-gdb.py.in',
output: 'libglib-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

7
gobject/meson.build
View File

@ -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