summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2020-08-31 10:48:07 +0200
committerPaolo Bonzini2020-09-01 14:51:34 +0200
commit87727cb1d20ebd43dac2e0c90e72be495d0dc72f (patch)
treeffc2b3921da756d69d1eabdc3ebcafb9a742d833 /configure
parentmeson: add pixman dependency to UI modules (diff)
downloadqemu-87727cb1d20ebd43dac2e0c90e72be495d0dc72f.tar.gz
qemu-87727cb1d20ebd43dac2e0c90e72be495d0dc72f.tar.xz
qemu-87727cb1d20ebd43dac2e0c90e72be495d0dc72f.zip
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index b9e977f13d..8a3acef89d 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}"