]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
configure: Fix CONFIG_QEMU_HELPERDIR generation
authorJan Kiszka <jan.kiszka@siemens.com>
Wed, 17 Oct 2012 17:09:25 +0000 (19:09 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Fri, 30 Nov 2012 21:21:15 +0000 (15:21 -0600)
We need to evaluate $libexecdir in configure, otherwise we literally end
up with "${prefix}/libexec" instead of the absolute path as
CONFIG_QEMU_HELPERDIR.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit 38f419f35225decdbaea9fe1fd00218f8924ce84)

Conflicts:

configure

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

index bf1863e4085c7c0b1bf819f0f6c40ea7b7c191ea..f01eb27ab4359ebb5308a42aad204fa160f8fee7 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=\"$libexecdir\"" >> $config_host_mak
+echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
 
 echo "ARCH=$ARCH" >> $config_host_mak
 if test "$debug_tcg" = "yes" ; then