qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	sw@weilnetz.de
Subject: [PATCH 1/5] meson: pass confsuffix option
Date: Tue, 25 Aug 2020 19:04:05 +0400	[thread overview]
Message-ID: <20200825150409.346957-2-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com>

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



  reply	other threads:[~2020-08-25 15:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-25 15:04 [PATCH 0/5] meson: mingw installation fixes & nsis conversion marcandre.lureau
2020-08-25 15:04 ` marcandre.lureau [this message]
2020-08-25 15:04 ` [PATCH 2/5] meson: use meson datadir instead of qemu_datadir marcandre.lureau
2020-08-25 15:04 ` [PATCH 3/5] meson: add docdir option and pass pre-prefix qemu_docdir marcandre.lureau
2020-08-25 15:04 ` [PATCH 4/5] meson: use meson mandir instead of qemu_mandir marcandre.lureau
2020-08-25 15:04 ` [PATCH 5/5] meson: add NSIS building marcandre.lureau
2020-08-25 15:11   ` Daniel P. Berrangé
2020-08-25 16:03     ` Peter Maydell
2020-08-25 16:07       ` Daniel P. Berrangé
2020-08-25 16:11   ` Peter Maydell
2020-08-25 16:38 ` [PATCH 0/5] meson: mingw installation fixes & nsis conversion Paolo Bonzini
2020-08-25 16:49   ` Marc-André Lureau
2020-08-25 18:14     ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200825150409.346957-2-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).