meson: Fix internal binaries

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/meson.build b/meson.build
index a835a3e53d009442cf57307d1d6c07ef9256ad6f..2f01ec93c8b3f4c09b9cf9e6490382e3baf8c6f2 100644 (file)
--- 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 4610eab5f626f17b8c9f9eb5d2315fc5a033b977..2dc927bfc08c50cb9e317d498dd0a57c72e87d94 100644 (file)
--- 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',