From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Jul 2021 14:19:35 +0000 (+0200)
Subject: meson: use project_build_root
X-Git-Tag: v250-rc1~913^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81875efe209cd0b4b836eddb0cebef209017b3dc;p=thirdparty%2Fsystemd.git

meson: use project_build_root

As documented in /meson.build where the variable is defined,
meson.build_root() doesn't work as expected with project nesting. I have
no idea why anyone would want to embed systemd in another meson project,
but let's use the variable if we have it.
---

diff --git a/src/test/meson.build b/src/test/meson.build
index 14725248cef..07625ad38c1 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -15,7 +15,7 @@ path = run_command(sh, '-c', 'echo "$PATH"').stdout().strip()
 test_env = environment()
 test_env.set('SYSTEMD_KBD_MODEL_MAP', kbd_model_map)
 test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
-test_env.set('PATH', '@0@:@1@'.format(meson.build_root(), path))
+test_env.set('PATH', project_build_root + ':' + path)
 
 ############################################################