[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] meson: pass confsuffix option
From: |
marcandre . lureau |
Subject: |
[PATCH 1/5] meson: pass confsuffix option |
Date: |
Tue, 25 Aug 2020 19:04:05 +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 | 1 +
2 files changed, 2 insertions(+)
diff --git a/configure b/configure
index b1e11397a8..e19e2de2f0 100755
--- a/configure
+++ b/configure
@@ -8222,6 +8222,7 @@ NINJA=$PWD/ninjatool $meson setup \
--mandir "${pre_prefix}$mandir" \
--sysconfdir "${pre_prefix}$sysconfdir" \
--localstatedir "${pre_prefix}$local_statedir" \
+ -Dconfsuffix="$confsuffix" \
-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..7bb2c0fca9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('confsuffix', type : 'string', value: 'qemu')
option('gettext', type : 'boolean', value : true)
option('sdl', type : 'feature', value : 'auto')
option('sdl_image', type : 'feature', value : 'auto')
--
2.26.2
- [PATCH 0/5] meson: mingw installation fixes & nsis conversion, marcandre . lureau, 2020/08/25
- [PATCH 1/5] meson: pass confsuffix option,
marcandre . lureau <=
- [PATCH 2/5] meson: use meson datadir instead of qemu_datadir, marcandre . lureau, 2020/08/25
- [PATCH 3/5] meson: add docdir option and pass pre-prefix qemu_docdir, marcandre . lureau, 2020/08/25
- [PATCH 4/5] meson: use meson mandir instead of qemu_mandir, marcandre . lureau, 2020/08/25
- [PATCH 5/5] meson: add NSIS building, marcandre . lureau, 2020/08/25
- Re: [PATCH 5/5] meson: add NSIS building, Peter Maydell, 2020/08/25
- Re: [PATCH 0/5] meson: mingw installation fixes & nsis conversion, Paolo Bonzini, 2020/08/25