aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Rogers <brogers@suse.com>2020-10-15 13:07:42 -0600
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-17 10:45:52 -0400
commitc6502638075557ff38fbb874af32f91186b667eb (patch)
treecb17f716c72ab52ff1a762588eb6e7d8bb02bb92
parent30fe76b17cc5aad395eb8a8a3da59e377a0b3d8e (diff)
downloadqemu-c6502638075557ff38fbb874af32f91186b667eb.zip
qemu-c6502638075557ff38fbb874af32f91186b667eb.tar.gz
qemu-c6502638075557ff38fbb874af32f91186b667eb.tar.bz2
configure: fix handling of --docdir parameter
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>
-rwxr-xr-xconfigure3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure b/configure
index f36a82e..ed81af9 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"