From 46b9598f1add728ee5a4f620a23c7ed2b6178596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 1 May 2022 10:21:08 +0200 Subject: [PATCH] meson: Fix template installation location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- templates/meson.build | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/templates/meson.build b/templates/meson.build index 2ee275c4a..14edb4e4c 100644 --- a/templates/meson.build +++ b/templates/meson.build @@ -3,8 +3,9 @@ template_scripts = configure_file( configuration: dummy_config_data, input: 'lxc-busybox.in', - output: 'lxc-busybox') -install_data(join_paths(project_build_root, 'templates/lxc-busybox'), install_dir: lxctemplatedir) + output: 'lxc-busybox', + install: true, + install_dir: lxctemplatedir) template_config_data = configuration_data() template_config_data.set_quoted('LXCHOOKDIR', lxchookdir) @@ -15,17 +16,20 @@ template_config_data.set_quoted('PACKAGE_VERSION', meson.project_version()) template_scripts = configure_file( configuration: template_config_data, input: 'lxc-download.in', - output: 'lxc-download') -install_data(join_paths(project_build_root, 'templates/lxc-download'), install_dir: lxchookdir) + output: 'lxc-download', + install: true, + install_dir: lxctemplatedir) template_scripts = configure_file( configuration: template_config_data, input: 'lxc-local.in', - output: 'lxc-local') -install_data(join_paths(project_build_root, 'templates/lxc-local'), install_dir: lxchookdir) + output: 'lxc-local', + install: true, + install_dir: lxctemplatedir) template_scripts = configure_file( configuration: template_config_data, input: 'lxc-oci.in', - output: 'lxc-oci') -install_data(join_paths(project_build_root, 'templates/lxc-oci'), install_dir: lxchookdir) + output: 'lxc-oci', + install: true, + install_dir: lxctemplatedir)