[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 4/8] meson: pass qemu_suffix option
From: |
marcandre . lureau |
Subject: |
[PATCH v3 4/8] meson: pass qemu_suffix option |
Date: |
Wed, 26 Aug 2020 15:04:15 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The following patches will make use of it to fix installation paths.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 1 +
meson_options.txt | 2 ++
2 files changed, 3 insertions(+)
diff --git a/configure b/configure
index e880e5676d..05b944fb8e 100755
--- a/configure
+++ b/configure
@@ -8223,6 +8223,7 @@ NINJA=$PWD/ninjatool $meson setup \
--mandir "${pre_prefix}$mandir" \
--sysconfdir "${pre_prefix}$sysconfdir" \
--localstatedir "${pre_prefix}$local_statedir" \
+ -Dqemu_suffix="$qemu_suffix" \
-Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2; fi)
\
-Ddebug=$(if test "$debug_info" = yes; then echo true; else echo
false; fi) \
-Dwerror=$(if test "$werror" = yes; then echo true; else echo false;
fi) \
diff --git a/meson_options.txt b/meson_options.txt
index c55f9cd94c..1ef822bab3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,5 @@
+option('qemu_suffix', type : 'string', value: '/qemu',
+ description: 'Suffix for QEMU data/modules/config directories (can be
empty)')
option('gettext', type : 'boolean', value : true)
option('sdl', type : 'feature', value : 'auto')
option('sdl_image', type : 'feature', value : 'auto')
--
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, 2020/08/26
- [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 <=
- [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