From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 17 Oct 2012 17:09:25 +0000 (+0200)
Subject: configure: Fix CONFIG_QEMU_HELPERDIR generation
X-Git-Tag: v1.2.2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=029eae1a7575bcb163f23a3676df1d1c7f7eb709;p=thirdparty%2Fqemu.git

configure: Fix CONFIG_QEMU_HELPERDIR generation

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>
---

diff --git a/configure b/configure
index bf1863e4085..f01eb27ab43 100755
--- 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