[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/24] configure: build docdir like other suffixed directories
From: |
Paolo Bonzini |
Subject: |
[PULL 13/24] configure: build docdir like other suffixed directories |
Date: |
Tue, 1 Sep 2020 05:11:21 -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>
Message-Id: <20200826110419.528931-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 66d7a72aa9..625b7ba062 100755
--- a/configure
+++ b/configure
@@ -1684,14 +1684,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}"
@@ -1841,7 +1841,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
@@ -6452,6 +6452,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
- [PULL 05/24] meson: install scripts/qemu-trace-stap, (continued)
- [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, 2020/09/01
- [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 <=
- [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
- [PULL 20/24] meson: add pixman dependency to UI modules, Paolo Bonzini, 2020/09/01
- [PULL 22/24] meson: use pkg-config method to find dependencies, Paolo Bonzini, 2020/09/01
- [PULL 15/24] meson: use meson datadir instead of qemu_datadir, Paolo Bonzini, 2020/09/01
- [PULL 23/24] build: fix recurse-all target, Paolo Bonzini, 2020/09/01