]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
fix CONFIG_QEMU_HELPERDIR generation again
authorMichael Tokarev <mjt@tls.msk.ru>
Sun, 21 Oct 2012 18:52:54 +0000 (22:52 +0400)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Fri, 30 Nov 2012 21:27:54 +0000 (15:27 -0600)
commit 38f419f35225 fixed a breakage with CONFIG_QEMU_HELPERDIR
which has been introduced by 8bf188aa18ef7a8.  But while techinically
that fix has been correct, all other similar variables are handled
differently.  Make it consistent, and let scripts/create_config
expand and capitalize the variable properly like for all other
qemu_*dir variables.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit f354b1a1ee7a1c72d51b42808724a2b10eec315f)

Conflicts:

configure

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
configure

index f01eb27ab4359ebb5308a42aad204fa160f8fee7..199a89b4d9be0522cf15e804533a728f60104bd5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3191,7 +3191,7 @@ echo "sysconfdir=$sysconfdir" >> $config_host_mak
 echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
 echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
 echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
-echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
+echo "qemu_helperdir=$libexecdir" >> $config_host_mak
 
 echo "ARCH=$ARCH" >> $config_host_mak
 if test "$debug_tcg" = "yes" ; then