ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: fix handling of --docdir parameter 

Commit ca8c0909f0 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: ca8c0909f0 ("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>
This commit is contained in:
Bruce Rogers 2020-10-15 13:07:42 -06:00 committed by Paolo Bonzini
parent 30fe76b17c
commit c650263807
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -969,7 +969,7 @@ for opt do
;; ;;
--with-suffix=*) qemu_suffix="$optarg" --with-suffix=*) qemu_suffix="$optarg"
;; ;;
--docdir=*) qemu_docdir="$optarg" --docdir=*) docdir="$optarg"
;; ;;
--sysconfdir=*) sysconfdir="$optarg" --sysconfdir=*) sysconfdir="$optarg"
;; ;;
@ -5776,7 +5776,6 @@ fi
qemu_confdir="$sysconfdir/$qemu_suffix" qemu_confdir="$sysconfdir/$qemu_suffix"
qemu_moddir="$libdir/$qemu_suffix" qemu_moddir="$libdir/$qemu_suffix"
qemu_datadir="$datadir/$qemu_suffix" qemu_datadir="$datadir/$qemu_suffix"
qemu_docdir="$docdir/$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"