From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 15 Nov 2021 17:16:40 +0000 (+0100)
Subject: meson: Define qemu_moddir correctly
X-Git-Tag: v7.10.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=591cb9d0d5e40eeff60cb18845197508b2878940;p=thirdparty%2Flibvirt.git

meson: Define qemu_moddir correctly

We can't hardcode /usr here, because the user might have
configured whatever arbitrary prefix.

Everything appeared to be okay because when joining paths
Meson will drop any component that precedes an absolute path
and libdir happens to be absolute, but we should still do
things correctly instead of relying on this.

Fixes: 2ad009eadde27491ff4248f481560953776b2a87
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/meson.build b/meson.build
index dd46572365..e1e4621868 100644
--- a/meson.build
+++ b/meson.build
@@ -1681,7 +1681,7 @@ if not get_option('driver_qemu').disabled()
 
     qemu_moddir = get_option('qemu_moddir')
     if qemu_moddir == ''
-      qemu_moddir = '/usr' / libdir / 'qemu'
+      qemu_moddir = libdir / 'qemu'
     endif
     conf.set_quoted('QEMU_MODDIR', qemu_moddir)