diff --git a/meson.build b/meson.build index fbefc8624..782fb503b 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project( meson_version: '>= 0.40.0', ) -go = find_program('go', required: false) +go = find_program('go') go_md2man = find_program('go-md2man') shellcheck = find_program('shellcheck', required: false) @@ -20,11 +20,6 @@ if shellcheck.found() test('shellcheck', shellcheck, args: [toolbox]) endif -install_data( - toolbox, - install_dir: get_option('bindir'), -) - bash_completion = dependency('bash-completion', required: false) if bash_completion.found() install_data( diff --git a/src/meson.build b/src/meson.build index 5db46f5cf..0122bc45a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -19,15 +19,15 @@ sources = files( 'pkg/version/version.go', ) -if go.found() - custom_target( - 'toolbox-go', - build_by_default: true, - command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()], - input: sources, - output: 'toolbox', - ) -endif +custom_target( + 'toolbox', + build_by_default: true, + command: [go_build_wrapper_program, meson.current_source_dir(), meson.current_build_dir()], + input: sources, + install: true, + install_dir: get_option('bindir'), + output: 'toolbox', +) if shellcheck.found() test('shellcheck go-build-wrapper', shellcheck, args: [go_build_wrapper_file])