meson: Export LXC_DISTRO_SYSCONF

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

diff --git a/config/sysconfig/meson.build b/config/sysconfig/meson.build
index 9ab3237f022c681990158bb1f4667e5aa31af7b5..65981cc9dfe169b3b6797c7b78357e7bd8473c16 100644 (file)
--- a/config/sysconfig/meson.build
+++ b/config/sysconfig/meson.build
@@ -1,18 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-fs = import('fs')
-if fs.is_dir('/etc/sysconfig')
+if distrosysconfdir != ''
     configure_file(
         configuration: conf,
         input: 'lxc.in',
         output: 'lxc',
         install: true,
-        install_dir: join_paths(sysconfdir, 'sysconfig'))
-elif fs.is_dir('/etc/default')
-    configure_file(
-        configuration: conf,
-        input: 'lxc.in',
-        output: 'lxc',
-        install: true,
-        install_dir: join_paths(sysconfdir, 'default'))
+        install_dir: distrosysconfdir)
 endif

diff --git a/meson.build b/meson.build
index c31b68c465fbbb34a61d56b5fb1dbb1df8a9baca..d687a496c89875000a7ff850efcc6b3989bf41db 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -115,6 +115,18 @@ conf.set_quoted('LXCTEMPLATEDIR', lxctemplatedir)
 conf.set_quoted('LXC_USERNIC_CONF', lxc_user_network_conf)
 conf.set_quoted('LXC_USERNIC_DB', lxc_user_network_db)
 
+# Set sysconfdir
+fs = import('fs')
+if fs.is_dir('/etc/sysconfig')
+    distrosysconfdir = join_paths(sysconfdir, 'sysconfig')
+    conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+elif fs.is_dir('/etc/default')
+    distrosysconfdir = join_paths(sysconfdir, 'default')
+    conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+else
+    distrosysconfdir = ''
+endif
+
 # Custom configuration.
 cgrouppattern = get_option('cgroup-pattern')
 init_script = get_option('init-script')