summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2021-03-21 17:58:44 +0000
committerDaiki Ueno <ueno@gnu.org>2021-03-21 17:58:44 +0000
commitd5b2f0426dec0ef767f5f3293a38d7341204f134 (patch)
tree2b2788841003882ee341527e374573db954cf4b4
parent7d6aacdc6628a7bf4aca5e0033db5e8e43fefeba (diff)
parent6b4a60b377d71eb37db66d530056fd9c700773cc (diff)
downloadlibsecret-d5b2f0426dec0ef767f5f3293a38d7341204f134.tar.gz
Merge branch 'meson-option' into 'master'
Add meson option to override default bashcompdir See merge request GNOME/libsecret!72
-rw-r--r--bash-completion/meson.build3
-rw-r--r--meson_options.txt2
2 files changed, 5 insertions, 0 deletions
diff --git a/bash-completion/meson.build b/bash-completion/meson.build
index 9e10d9e..dbbf5d3 100644
--- a/bash-completion/meson.build
+++ b/bash-completion/meson.build
@@ -8,3 +8,6 @@ if bashcompdir == ''
warning('Will not install bash completion due to missing dependencies!')
endif
endif
+if bashcompdir != ''
+ install_data('secret-tool', install_dir: bashcompdir)
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 445aeb0..8858a33 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,3 +4,5 @@ option('debugging', type: 'boolean', value: false, description: 'Turn debugging
option('vapi', type: 'boolean', value: true, description: 'Create VAPI file.')
option('gtk_doc', type: 'boolean', value: true, description: 'Build reference documentation using gtk-doc')
option('introspection', type: 'boolean', value: true, description: 'Create GIR file.')
+option('bashcompdir', type: 'string', value: '', description: 'Override default location for bash completion files')
+option('bash_completion', type: 'feature', value: 'auto', description: 'Install bash completion files')