From: Kai Lüke <kailueke@riseup.net>
Date: Thu, 14 Jul 2022 21:49:16 +0000 (+0200)
Subject: meson: Install binaries to prefix
X-Git-Tag: v2.39-rc1~567^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eb2a4769100667d619de55ba7eabc9fc64a1dd4;p=thirdparty%2Futil-linux.git

meson: Install binaries to prefix

When compiled in Flatpak /usr is read-only and the /app prefix is used.
However, the binary installation did not use the prefix but had /usr
hardcoded.
Use the prefix instead of /usr when assembling the prefix/(s)bin paths.

Signed-off-by: Kai Lüke <kailueke@riseup.net>
---

diff --git a/meson.build b/meson.build
index 536bb36fac..73d67d1dda 100644
--- a/meson.build
+++ b/meson.build
@@ -22,9 +22,9 @@ sysconfstaticdir = join_paths(prefixdir, 'lib')
 docdir = join_paths(prefixdir, get_option('datadir'), 'doc', 'util-linux')
 mandir = join_paths(prefixdir, get_option('mandir'))
 runstatedir = '/run'
-execprefixdir = '/usr'
-usrbin_exec_dir = join_paths(execprefixdir, 'bin')
-usrsbin_exec_dir = join_paths(execprefixdir, 'sbin')
+execprefixdir = prefixdir
+usrbin_exec_dir = join_paths(execprefixdir, bindir)
+usrsbin_exec_dir = join_paths(execprefixdir, sbindir)
 sysconfdir = '/etc'
 localstatedir = '/var'
 bash_completion = dependency('bash-completion', required : get_option('build-bash-completion'))