From e91119c3a4f3035c96e34354bc2016c4cacf067f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 6 Jun 2022 20:55:45 -0400 Subject: [PATCH] meson: adjust rootlibdir default for multiarch On Debian, libdir is commonly something like 'lib/x86_64-linux-gnu'. The result of get_option('libdir') is normalized to a prefix-relative path by meson, so we can just append it to rootprefixdir. Fixes https://github.com/systemd/systemd/issues/23648. --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ce2d9679b4c..2daaf3f4000 100644 --- a/meson.build +++ b/meson.build @@ -144,7 +144,12 @@ rootlibexecdir = rootprefixdir / 'lib/systemd' rootlibdir = get_option('rootlibdir') if rootlibdir == '' - rootlibdir = rootprefixdir / libdir.split('/')[-1] + # This will be a relative path if libdir is in prefix. + rootlibdir = get_option('libdir') +endif +if not rootlibdir.startswith('/') + # If we have a relative path, add rootprefixdir to the front. + rootlibdir = rootprefixdir / rootlibdir endif rootpkglibdir = rootlibdir / 'systemd' -- 2.47.3