[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/24] configure: rename confsuffix option
From: |
Paolo Bonzini |
Subject: |
[PULL 11/24] configure: rename confsuffix option |
Date: |
Tue, 1 Sep 2020 05:11:19 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The value is used to construct conf/mod/data directories.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index e8946aeefb..46fe7914c3 100755
--- a/configure
+++ b/configure
@@ -474,7 +474,7 @@ modules="no"
module_upgrades="no"
prefix="/usr/local"
firmwarepath="\${prefix}/share/qemu-firmware"
-confsuffix="/qemu"
+qemu_suffix="/qemu"
slirp=""
oss_lib=""
bsd="no"
@@ -1012,7 +1012,7 @@ if test "$mingw32" = "yes" ; then
LIBS="-liberty $LIBS"
fi
prefix="c:/Program Files/QEMU"
- confsuffix=""
+ qemu_suffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi
-lnetapi32 $libs_qga"
fi
@@ -1122,7 +1122,7 @@ for opt do
;;
--datadir=*) datadir="$optarg"
;;
- --with-confsuffix=*) confsuffix="$optarg"
+ --with-suffix=*) qemu_suffix="$optarg"
;;
--docdir=*) qemu_docdir="$optarg"
;;
@@ -1832,16 +1832,16 @@ 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$confsuffix
- --docdir=PATH install documentation in PATH$confsuffix
+ --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$confsuffix
+ --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.
- --with-confsuffix=SUFFIX suffix for QEMU data inside
datadir/libdir/sysconfdir [$confsuffix]
+ --with-suffix=SUFFIX suffix for QEMU data inside
datadir/libdir/sysconfdir [$qemu_suffix]
--with-pkgversion=VERS use specified string as sub-version of the package
--enable-debug enable common debug build options
--enable-sanitizers enable default sanitizers
@@ -6449,9 +6449,9 @@ EOF
fi
fi
-qemu_confdir=$sysconfdir$confsuffix
-qemu_moddir=$libdir$confsuffix
-qemu_datadir=$datadir$confsuffix
+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
- [PULL 00/24] Meson changes for 2020-09-01, Paolo Bonzini, 2020/09/01
- [PULL 02/24] block: always link with zlib, Paolo Bonzini, 2020/09/01
- [PULL 01/24] meson: bump submodule to 0.55.1, Paolo Bonzini, 2020/09/01
- [PULL 03/24] meson: fix SDL2_image detection, Paolo Bonzini, 2020/09/01
- [PULL 05/24] meson: install scripts/qemu-trace-stap, Paolo Bonzini, 2020/09/01
- [PULL 04/24] meson: install pc-bios blobs, Paolo Bonzini, 2020/09/01
- [PULL 06/24] meson: install icons, Paolo Bonzini, 2020/09/01
- [PULL 09/24] build-sys: remove install target from Makefile, Paolo Bonzini, 2020/09/01
- [PULL 08/24] meson: install $localstatedir/run for qga, Paolo Bonzini, 2020/09/01
- [PULL 11/24] configure: rename confsuffix option,
Paolo Bonzini <=
- [PULL 07/24] meson: install desktop file, Paolo Bonzini, 2020/09/01
- [PULL 10/24] meson: move zlib detection to meson, Paolo Bonzini, 2020/09/01
- [PULL 12/24] configure: always /-seperate directory from qemu_suffix, Paolo Bonzini, 2020/09/01
- [PULL 14/24] meson: pass qemu_suffix option, Paolo Bonzini, 2020/09/01
- [PULL 13/24] configure: build docdir like other suffixed directories, Paolo Bonzini, 2020/09/01
- [PULL 17/24] meson: use meson mandir instead of qemu_mandir, Paolo Bonzini, 2020/09/01
- [PULL 16/24] meson: pass docdir option, Paolo Bonzini, 2020/09/01
- [PULL 19/24] meson: add pixman dependency to chardev/baum module, Paolo Bonzini, 2020/09/01
- [PULL 21/24] configure: do not include ${prefix} in firmwarepath, Paolo Bonzini, 2020/09/01
- [PULL 24/24] meson: add description to options, Paolo Bonzini, 2020/09/01