From 8b1936b46f2d83b9672303cca432e6108f6956a9 Mon Sep 17 00:00:00 2001 From: Dhanuka Warusadura Date: Thu, 18 Mar 2021 13:50:01 +0530 Subject: [PATCH 1/2] Add meson option to override of default bashcompdir These changes introduce a new meson option to disable installation of completion files into the system location. --- bash-completion/meson.build | 3 +++ meson_options.txt | 1 + 2 files changed, 4 insertions(+) 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..87dced1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,3 +4,4 @@ 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') From 6b4a60b377d71eb37db66d530056fd9c700773cc Mon Sep 17 00:00:00 2001 From: Dhanuka Warusadura Date: Fri, 19 Mar 2021 12:15:33 +0530 Subject: [PATCH 2/2] Add meson option to set default bash_completion installation location These changes introduce a new meson option to set the default location for bash_completion. This will enable the installation of completion files into the system location. --- meson_options.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/meson_options.txt b/meson_options.txt index 87dced1..8858a33 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,3 +5,4 @@ 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')