[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/8] configure: build docdir like other suffixed directories
From: |
marcandre . lureau |
Subject: |
[PATCH v3 3/8] configure: build docdir like other suffixed directories |
Date: |
Wed, 26 Aug 2020 15:04:14 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
As documented in --help for --docdir.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 61216b9210..e880e5676d 100755
--- a/configure
+++ b/configure
@@ -1676,14 +1676,14 @@ includedir="${includedir:-$prefix/include}"
if test "$mingw32" = "yes" ; then
mandir="$prefix"
datadir="$prefix"
- qemu_docdir="$prefix"
+ docdir="$prefix"
bindir="$prefix"
sysconfdir="$prefix"
local_statedir=
else
mandir="${mandir:-$prefix/share/man}"
datadir="${datadir:-$prefix/share}"
- qemu_docdir="${qemu_docdir:-$prefix/share/doc/qemu}"
+ docdir="${docdir:-$prefix/share/doc}"
bindir="${bindir:-$prefix/bin}"
sysconfdir="${sysconfdir:-$prefix/etc}"
local_statedir="${local_statedir:-$prefix/var}"
@@ -1832,7 +1832,7 @@ Advanced options (experts only):
--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-suffix=SUFFIX suffix for QEMU data inside
datadir/libdir/sysconfdir [$qemu_suffix]
+ --with-suffix=SUFFIX suffix for QEMU data inside
datadir/libdir/sysconfdir/docdir [$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
@@ -6470,6 +6470,7 @@ fi
qemu_confdir="$sysconfdir/$qemu_suffix"
qemu_moddir="$libdir/$qemu_suffix"
qemu_datadir="$datadir/$qemu_suffix"
+qemu_docdir="$docdir/$qemu_suffix"
qemu_localedir="$datadir/locale"
qemu_icondir="$datadir/icons"
qemu_desktopdir="$datadir/applications"
--
2.26.2
- [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, marcandre . lureau, 2020/08/26
- [PATCH v3 1/8] configure: rename confsuffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix, marcandre . lureau, 2020/08/26
- [PATCH v3 3/8] configure: build docdir like other suffixed directories,
marcandre . lureau <=
- [PATCH v3 4/8] meson: pass qemu_suffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 5/8] meson: use meson datadir instead of qemu_datadir, marcandre . lureau, 2020/08/26
- [PATCH v3 6/8] meson: pass docdir option, marcandre . lureau, 2020/08/26
- [PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir, marcandre . lureau, 2020/08/26
- [PATCH v3 8/8] meson: add NSIS building, marcandre . lureau, 2020/08/26
- Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, Paolo Bonzini, 2020/08/26