[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/22] configure: fix handling of --docdir parameter
From: |
Paolo Bonzini |
Subject: |
[PULL 14/22] configure: fix handling of --docdir parameter |
Date: |
Fri, 16 Oct 2020 07:48:06 -0400 |
From: Bruce Rogers <brogers@suse.com>
Commit ca8c0909f01 changed qemu_docdir to be docdir, then later uses the
qemu_docdir name in the final assignment. Unfortunately, one instance of
qemu_docdir was missed: the one which comes from the --docdir parameter.
This patch restores the proper handling of the --docdir parameter.
Fixes: ca8c0909f01 ("configure: build docdir like other suffixed
directories")
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201015190742.270629-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure b/configure
index c83a2eeb9d..3edbdd2a24 100755
--- a/configure
+++ b/configure
@@ -969,7 +969,7 @@ for opt do
;;
--with-suffix=*) qemu_suffix="$optarg"
;;
- --docdir=*) qemu_docdir="$optarg"
+ --docdir=*) docdir="$optarg"
;;
--sysconfdir=*) sysconfdir="$optarg"
;;
@@ -5776,7 +5776,6 @@ 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 00/22] Build system + misc changes for 2020-10-16, Paolo Bonzini, 2020/10/16
- [PULL 01/22] submodules: bump meson to 0.55.3, Paolo Bonzini, 2020/10/16
- [PULL 02/22] Makefile: Ensure cscope.out/tags/TAGS are generated in the source tree, Paolo Bonzini, 2020/10/16
- [PULL 03/22] tests/Makefile.include: unbreak non-tcg builds, Paolo Bonzini, 2020/10/16
- [PULL 06/22] configure: move QEMU_INCLUDES to meson, Paolo Bonzini, 2020/10/16
- [PULL 05/22] tests: add missing generated sources to testqapi, Paolo Bonzini, 2020/10/16
- [PULL 08/22] add ninja to dockerfiles, CI configurations and test VMs, Paolo Bonzini, 2020/10/16
- [PULL 11/22] build: add --enable/--disable-libudev, Paolo Bonzini, 2020/10/16
- [PULL 04/22] make: run shell with pipefail, Paolo Bonzini, 2020/10/16
- [PULL 14/22] configure: fix handling of --docdir parameter,
Paolo Bonzini <=
- [PULL 07/22] dockerfiles: enable Centos 8 PowerTools, Paolo Bonzini, 2020/10/16
- [PULL 13/22] meson: cleanup curses/iconv test, Paolo Bonzini, 2020/10/16
- [PULL 12/22] meson.build: don't condition iconv detection on library detection, Paolo Bonzini, 2020/10/16
- [PULL 09/22] build: cleanups to Makefile, Paolo Bonzini, 2020/10/16
- [PULL 15/22] meson: Only install icons and qemu.desktop if have_system, Paolo Bonzini, 2020/10/16
- [PULL 16/22] docs: Fix Sphinx configuration for msys2/mingw, Paolo Bonzini, 2020/10/16
- [PULL 18/22] meson: Move the detection logic for sphinx to meson, Paolo Bonzini, 2020/10/16
- [PULL 10/22] build: replace ninjatool with ninja, Paolo Bonzini, 2020/10/16