aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-08-26 15:04:12 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-01 08:51:32 -0400
commit77433a5fef35de9ac636a1f36dc1fad2855baa5e (patch)
treed379adbf14b8dbcf482fc706a91fa40d614a3fca
parent1ffb3bbb3cb1273a2ad17599dbe82f9c8d3682a2 (diff)
configure: rename confsuffix option
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>
-rwxr-xr-xconfigure20
1 files 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"