From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 31 Aug 2020 08:48:07 +0000 (-0400)
Subject: configure: do not include ${prefix} in firmwarepath
X-Git-Tag: v5.2.0-rc0~144^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87727cb1d20ebd43dac2e0c90e72be495d0dc72f;p=thirdparty%2Fqemu.git

configure: do not include ${prefix} in firmwarepath

Left out in commit 22a87800e6 ("configure: expand path variables for
meson configure", 2020-08-21), do it now.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/configure b/configure
index b9e977f13d2..8a3acef89d9 100755
--- a/configure
+++ b/configure
@@ -473,7 +473,6 @@ LDFLAGS_SHARED="-shared"
 modules="no"
 module_upgrades="no"
 prefix="/usr/local"
-firmwarepath="\${prefix}/share/qemu-firmware"
 qemu_suffix="qemu"
 slirp=""
 oss_lib=""
@@ -1677,6 +1676,7 @@ for opt do
   esac
 done
 
+firmwarepath="${firmwarepath:-$prefix/share/qemu-firmware}"
 libdir="${libdir:-$prefix/lib}"
 libexecdir="${libexecdir:-$prefix/libexec}"
 includedir="${includedir:-$prefix/include}"