configure: do not include ${prefix} in firmwarepath
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 31 Aug 2020 08:48:07 +0000 (04:48 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 1 Sep 2020 12:51:34 +0000 (08:51 -0400)
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>
configure

index b9e977f13d279763c82afc972080717a9fd48c7a..8a3acef89d91737f253b6e771dc424438043689d 100755 (executable)
--- 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}"