[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/24] configure: do not include ${prefix} in firmwarepath
From: |
Paolo Bonzini |
Subject: |
[PULL 21/24] configure: do not include ${prefix} in firmwarepath |
Date: |
Tue, 1 Sep 2020 05:11:29 -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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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}"
--
2.26.2
- [PULL 08/24] meson: install $localstatedir/run for qga, (continued)
- [PULL 08/24] meson: install $localstatedir/run for qga, Paolo Bonzini, 2020/09/01
- [PULL 11/24] configure: rename confsuffix option, Paolo Bonzini, 2020/09/01
- [PULL 07/24] meson: install desktop file, Paolo Bonzini, 2020/09/01
- [PULL 10/24] meson: move zlib detection to meson, Paolo Bonzini, 2020/09/01
- [PULL 12/24] configure: always /-seperate directory from qemu_suffix, Paolo Bonzini, 2020/09/01
- [PULL 14/24] meson: pass qemu_suffix option, Paolo Bonzini, 2020/09/01
- [PULL 13/24] configure: build docdir like other suffixed directories, Paolo Bonzini, 2020/09/01
- [PULL 17/24] meson: use meson mandir instead of qemu_mandir, Paolo Bonzini, 2020/09/01
- [PULL 16/24] meson: pass docdir option, Paolo Bonzini, 2020/09/01
- [PULL 19/24] meson: add pixman dependency to chardev/baum module, Paolo Bonzini, 2020/09/01
- [PULL 21/24] configure: do not include ${prefix} in firmwarepath,
Paolo Bonzini <=
- [PULL 24/24] meson: add description to options, Paolo Bonzini, 2020/09/01
- [PULL 20/24] meson: add pixman dependency to UI modules, Paolo Bonzini, 2020/09/01
- [PULL 22/24] meson: use pkg-config method to find dependencies, Paolo Bonzini, 2020/09/01
- [PULL 15/24] meson: use meson datadir instead of qemu_datadir, Paolo Bonzini, 2020/09/01
- [PULL 23/24] build: fix recurse-all target, Paolo Bonzini, 2020/09/01
- [PULL 18/24] meson: add NSIS building, Paolo Bonzini, 2020/09/01
- Re: [PULL 00/24] Meson changes for 2020-09-01, Peter Maydell, 2020/09/01
- Re: [PULL 00/24] Meson changes for 2020-09-01, Yonggang Luo, 2020/09/01