From 6c0b045e1a97e44a474e214501cfe0ebe91fa20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20M=C3=ADchal?= Date: Fri, 20 May 2022 20:17:33 +0300 Subject: [PATCH] build: Make the completion depend on the Toolbx binary Fallout from bafbbe81c9220cb3749a19a244e45a61477553a6 https://github.com/containers/toolbox/pull/1055 https://github.com/containers/toolbox/pull/1115 --- completion/meson.build | 3 +++ src/meson.build | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/completion/meson.build b/completion/meson.build index 701c634..805f4e4 100644 --- a/completion/meson.build +++ b/completion/meson.build @@ -17,6 +17,7 @@ endif completion_bash = custom_target('bash-completion', capture: true, command: [generate_completions_program, meson.global_source_root() / 'src', 'bash'], + depends: [toolbox], install: true, install_dir: bash_comp_dir, output: 'toolbox') @@ -24,6 +25,7 @@ completion_bash = custom_target('bash-completion', completion_zsh = custom_target('zsh-completion', capture: true, command: [generate_completions_program, meson.global_source_root() / 'src', 'zsh'], + depends: [toolbox], install: true, install_dir: get_option('datadir') / 'zsh' / 'site_functions', output: '_toolbox') @@ -31,6 +33,7 @@ completion_zsh = custom_target('zsh-completion', completion_fish = custom_target('fish-completion', capture: true, command: [generate_completions_program, meson.global_source_root() / 'src', 'fish'], + depends: [toolbox], install: true, install_dir: fish_comp_dir, output: 'toolbox.fish') diff --git a/src/meson.build b/src/meson.build index 9adc42a..cef82c6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -48,7 +48,7 @@ endif message('Host machine dynamic linker:', dynamic_linker) -custom_target( +toolbox = custom_target( 'toolbox', build_by_default: true, command: [