From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 09/17] configure: allow configuring localedir
Date: Mon, 26 Oct 2020 09:51:23 -0400 [thread overview]
Message-ID: <20201026135131.3006712-10-pbonzini@redhat.com> (raw)
In-Reply-To: <20201026135131.3006712-1-pbonzini@redhat.com>
Meson has a localedir option, so passing the path through that option
is the cleanest way when we move directories out of config-host.mak.
In preparation for doing that without changing semantics and without
special-casing localedir code, add a configure option.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index e6754c1e87..c214e9b38e 100755
--- a/configure
+++ b/configure
@@ -962,6 +962,8 @@ for opt do
;;
--docdir=*) docdir="$optarg"
;;
+ --localedir=*) localedir="$optarg"
+ ;;
--sysconfdir=*) sysconfdir="$optarg"
;;
--localstatedir=*) local_statedir="$optarg"
@@ -971,7 +973,7 @@ for opt do
--host=*|--build=*|\
--disable-dependency-tracking|\
--sbindir=*|--sharedstatedir=*|\
- --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
+ --oldincludedir=*|--datarootdir=*|--infodir=*|\
--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
# These switches are silently ignored, for compatibility with
# autoconf-generated configure scripts. This allows QEMU's
@@ -1525,6 +1527,7 @@ firmwarepath="${firmwarepath:-$prefix/share/qemu-firmware}"
libdir="${libdir:-$prefix/lib}"
libexecdir="${libexecdir:-$prefix/libexec}"
includedir="${includedir:-$prefix/include}"
+localedir="${localedir:-$datadir/locale}"
if test "$mingw32" = "yes" ; then
mandir="$prefix"
@@ -1670,6 +1673,7 @@ Advanced options (experts only):
--static enable static build [$static]
--mandir=PATH install man pages in PATH
--datadir=PATH install firmware in PATH/$qemu_suffix
+ --localedir=PATH install translation in PATH/$qemu_suffix
--docdir=PATH install documentation in PATH/$qemu_suffix
--bindir=PATH install binaries in PATH
--libdir=PATH install libraries in PATH
@@ -5728,7 +5732,6 @@ fi
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"
@@ -5912,7 +5915,7 @@ if test "$mingw32" = "no" ; then
echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
fi
echo "qemu_helperdir=$libexecdir" >> $config_host_mak
-echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
+echo "qemu_localedir=$localedir" >> $config_host_mak
echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak
echo "GIT=$git" >> $config_host_mak
--
2.26.2
next prev parent reply other threads:[~2020-10-26 14:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 13:51 [PULL 00/17] Build system changes and misc fixes for QEMU 5.2 soft freeze Paolo Bonzini
2020-10-26 13:51 ` [PULL 01/17] build: fix macOS --enable-modules build Paolo Bonzini
2020-10-27 9:27 ` Philippe Mathieu-Daudé
2020-10-27 13:27 ` Paolo Bonzini
2020-10-27 15:21 ` Gerd Hoffmann
2020-10-27 15:33 ` Gerd Hoffmann
2020-10-26 13:51 ` [PULL 02/17] meson: rewrite curses/iconv test Paolo Bonzini
2020-10-26 13:51 ` [PULL 03/17] do not use colons in test names Paolo Bonzini
2020-10-26 13:51 ` [PULL 04/17] hw/core/qdev-clock: add a reference on aliased clocks Paolo Bonzini
2020-10-26 13:51 ` [PULL 05/17] qtest: unbreak non-TCG builds in bios-tables-test Paolo Bonzini
2020-10-26 13:51 ` [PULL 06/17] replay: do not build if TCG is not available Paolo Bonzini
2020-10-26 13:51 ` [PULL 07/17] Remove deprecated -no-kvm option Paolo Bonzini
2020-10-26 13:51 ` [PULL 08/17] Makefile: separate meson rerun from the rest of the ninja invocation Paolo Bonzini
2020-10-26 13:51 ` Paolo Bonzini [this message]
2020-10-26 13:51 ` [PULL 10/17] configure: move directory options from config-host.mak to meson Paolo Bonzini
2020-10-26 13:51 ` [PULL 11/17] configure: remove unused variable from config-host.mak Paolo Bonzini
2020-10-26 13:51 ` [PULL 12/17] configure: move install_blobs from configure to meson Paolo Bonzini
2020-10-26 13:51 ` [PULL 13/17] WHPX: Fix WHPX build break Paolo Bonzini
2020-10-26 13:51 ` [PULL 14/17] win32: boot broken when bind & data dir are the same Paolo Bonzini
2020-10-26 13:51 ` [PULL 15/17] machine: remove deprecated -machine enforce-config-section option Paolo Bonzini
2020-10-26 13:51 ` [PULL 16/17] machine: move UP defaults to class_base_init Paolo Bonzini
2020-10-26 13:51 ` [PULL 17/17] machine: move SMP initialization from vl.c Paolo Bonzini
2020-10-26 17:18 ` [PULL 00/17] Build system changes and misc fixes for QEMU 5.2 soft freeze Peter Maydell
2020-10-26 18:59 ` 罗勇刚(Yonggang Luo)
2020-10-26 20:58 ` Paolo Bonzini
2020-10-26 21:04 ` 罗勇刚(Yonggang Luo)
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=20201026135131.3006712-10-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).