openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Marc-André Lureau 2020-08-26 15:04:12 +04:00 committed by Paolo Bonzini
parent 1ffb3bbb3c
commit 77433a5fef
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -474,7 +474,7 @@ modules="no"
module_upgrades="no" module_upgrades="no"
prefix="/usr/local" prefix="/usr/local"
firmwarepath="\${prefix}/share/qemu-firmware" firmwarepath="\${prefix}/share/qemu-firmware"
confsuffix="/qemu" qemu_suffix="/qemu"
slirp="" slirp=""
oss_lib="" oss_lib=""
bsd="no" bsd="no"
@ -1012,7 +1012,7 @@ if test "$mingw32" = "yes" ; then
LIBS="-liberty $LIBS" LIBS="-liberty $LIBS"
fi fi
prefix="c:/Program Files/QEMU" prefix="c:/Program Files/QEMU"
confsuffix="" qemu_suffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga" libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga"
fi fi
@ -1122,7 +1122,7 @@ for opt do
;; ;;
--datadir=*) datadir="$optarg" --datadir=*) datadir="$optarg"
;; ;;
--with-confsuffix=*) confsuffix="$optarg" --with-suffix=*) qemu_suffix="$optarg"
;; ;;
--docdir=*) qemu_docdir="$optarg" --docdir=*) qemu_docdir="$optarg"
;; ;;
@ -1832,16 +1832,16 @@ Advanced options (experts only):
--with-git=GIT use specified git [$git] --with-git=GIT use specified git [$git]
--static enable static build [$static] --static enable static build [$static]
--mandir=PATH install man pages in PATH --mandir=PATH install man pages in PATH
--datadir=PATH install firmware in PATH$confsuffix --datadir=PATH install firmware in PATH$qemu_suffix
--docdir=PATH install documentation in PATH$confsuffix --docdir=PATH install documentation in PATH$qemu_suffix
--bindir=PATH install binaries in PATH --bindir=PATH install binaries in PATH
--libdir=PATH install libraries in PATH --libdir=PATH install libraries in PATH
--libexecdir=PATH install helper binaries 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) --localstatedir=PATH install local state in PATH (set at runtime on win32)
--firmwarepath=PATH search PATH for firmware files --firmwarepath=PATH search PATH for firmware files
--efi-aarch64=PATH PATH of efi file to use for aarch64 VMs. --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 --with-pkgversion=VERS use specified string as sub-version of the package
--enable-debug enable common debug build options --enable-debug enable common debug build options
--enable-sanitizers enable default sanitizers --enable-sanitizers enable default sanitizers
@ -6449,9 +6449,9 @@ EOF
fi fi
fi fi
qemu_confdir=$sysconfdir$confsuffix qemu_confdir=$sysconfdir$qemu_suffix
qemu_moddir=$libdir$confsuffix qemu_moddir=$libdir$qemu_suffix
qemu_datadir=$datadir$confsuffix qemu_datadir=$datadir$qemu_suffix
qemu_localedir="$datadir/locale" qemu_localedir="$datadir/locale"
qemu_icondir="$datadir/icons" qemu_icondir="$datadir/icons"
qemu_desktopdir="$datadir/applications" qemu_desktopdir="$datadir/applications"