[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix
From: |
marcandre . lureau |
Subject: |
[PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix |
Date: |
Wed, 26 Aug 2020 15:04:13 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Otherwise, we may accept very strange directory names...
While at it, quote the variables.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 0e04c47722..61216b9210 100755
--- a/configure
+++ b/configure
@@ -474,7 +474,7 @@ modules="no"
module_upgrades="no"
prefix="/usr/local"
firmwarepath="\${prefix}/share/qemu-firmware"
-qemu_suffix="/qemu"
+qemu_suffix="qemu"
slirp=""
oss_lib=""
bsd="no"
@@ -1823,12 +1823,12 @@ Advanced options (experts only):
--with-git=GIT use specified git [$git]
--static enable static build [$static]
--mandir=PATH install man pages in PATH
- --datadir=PATH install firmware in PATH$qemu_suffix
- --docdir=PATH install documentation in PATH$qemu_suffix
+ --datadir=PATH install firmware in PATH/$qemu_suffix
+ --docdir=PATH install documentation in PATH/$qemu_suffix
--bindir=PATH install binaries in PATH
--libdir=PATH install libraries in PATH
--libexecdir=PATH install helper binaries in PATH
- --sysconfdir=PATH install config in PATH$qemu_suffix
+ --sysconfdir=PATH install config in PATH/$qemu_suffix
--localstatedir=PATH install local state in PATH (set at runtime on
win32)
--firmwarepath=PATH search PATH for firmware files
--efi-aarch64=PATH PATH of efi file to use for aarch64 VMs.
@@ -6467,9 +6467,9 @@ EOF
fi
fi
-qemu_confdir=$sysconfdir$qemu_suffix
-qemu_moddir=$libdir$qemu_suffix
-qemu_datadir=$datadir$qemu_suffix
+qemu_confdir="$sysconfdir/$qemu_suffix"
+qemu_moddir="$libdir/$qemu_suffix"
+qemu_datadir="$datadir/$qemu_suffix"
qemu_localedir="$datadir/locale"
qemu_icondir="$datadir/icons"
qemu_desktopdir="$datadir/applications"
--
2.26.2
- [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, marcandre . lureau, 2020/08/26
- [PATCH v3 1/8] configure: rename confsuffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix,
marcandre . lureau <=
- [PATCH v3 3/8] configure: build docdir like other suffixed directories, marcandre . lureau, 2020/08/26
- [PATCH v3 4/8] meson: pass qemu_suffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 5/8] meson: use meson datadir instead of qemu_datadir, marcandre . lureau, 2020/08/26
- [PATCH v3 6/8] meson: pass docdir option, marcandre . lureau, 2020/08/26
- [PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir, marcandre . lureau, 2020/08/26
- [PATCH v3 8/8] meson: add NSIS building, marcandre . lureau, 2020/08/26
- Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, Paolo Bonzini, 2020/08/26