From: Stéphane Graber Date: Sun, 1 May 2022 08:21:33 +0000 (+0200) Subject: meson: Fix internal binaries X-Git-Tag: lxc-5.0.0~21^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f1bf5f58b1af234c8d38f4d1658b7f8c2eae958;p=thirdparty%2Flxc.git meson: Fix internal binaries Signed-off-by: Stéphane Graber --- diff --git a/meson.build b/meson.build index a835a3e53..2f01ec93c 100644 --- a/meson.build +++ b/meson.build @@ -70,6 +70,7 @@ lxcdefaultconfig = join_paths(sysconfdir, 'lxc/default.conf') lxcglobalconfig = join_paths(sysconfdir, globalconfig) lxcapparmorcachedir = join_paths(localstatedir, apparmorcachedir) lxcrootfsmount = join_paths(prefixdir, rootfsmount) +lxclibexec = join_paths(libexecdir, 'lxc') lxclogpath = join_paths(localstatedir, logpath) lxcpath = join_paths(localstatedir, lxcpathprefix) lxctemplateconfig = join_paths(datadir, 'lxc/config') diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build index 4610eab5f..2dc927bfc 100644 --- a/src/lxc/cmd/meson.build +++ b/src/lxc/cmd/meson.build @@ -176,13 +176,15 @@ cmd_programs += executable( link_args: ['-static'], c_args: ['-DNO_LXC_CONF'], dependencies: [libcap_static], + install_dir: sbindir, install: true) cmd_programs += executable( - 'lxc-init', + 'init.lxc', cmd_lxc_init_sources, include_directories: cmd_liblxc_includes, dependencies: liblxc_dep, + install_dir: sbindir, install: true) cmd_programs += executable( @@ -190,14 +192,16 @@ cmd_programs += executable( cmd_lxc_monitord_sources, include_directories: cmd_liblxc_includes, dependencies: liblxc_dep, - install: true) + install: true, + install_dir: lxclibexec) cmd_programs += executable( 'lxc-user-nic', cmd_lxc_user_nic_sources, include_directories: cmd_liblxc_includes, dependencies: liblxc_dep, - install: true) + install: true, + install_dir: lxclibexec) cmd_programs += executable( 'lxc-usernsexec',