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

Merge branch '1054-check-bash-comp-dir' into 'master'

Browse Source 
Check the completiondir from bash-completion package config file.

Closes #1054

See merge request GNOME/glib!1896
This commit is contained in:
Philip Withnall 2021-01-29 17:21:31 +00:00
commit 3970ddec06
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/meson.build
View File

@ -769,6 +769,17 @@ if host_system == 'windows'
endif
if have_bash
bash_comp_inst_dir = ''
if bash_comp_dep.found()
bash_comp_dir_override = bash_comp_dep.version().version_compare('>= 2.10') ? ['datadir', get_option('datadir')] : ['prefix', get_option('prefix')]
bash_comp_inst_dir = bash_comp_dep.get_pkgconfig_variable('completionsdir', define_variable: bash_comp_dir_override)
endif
if bash_comp_inst_dir == ''
message('Found bash-completion but the .pc file did not set \'completionsdir\', fallback to a predefined path')
bash_comp_inst_dir = join_paths(get_option('datadir'), 'bash-completion/completions')
endif
install_data([
'completion/gapplication',
'completion/gdbus',
@ -776,7 +787,7 @@ if have_bash
'completion/gsettings',
'completion/gresource'
],
install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'))
install_dir: bash_comp_inst_dir)
endif
if enable_dtrace

1
meson.build
View File

@ -2219,6 +2219,7 @@ endif
# Determine which user environment-dependent files that we want to install
have_bash = find_program('bash', required : false).found() # For completion scripts
bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
have_sh = find_program('sh', required : false).found() # For glib-gettextize
# Some installed tests require a custom environment