summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-10-17 19:09:25 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2012-11-30 15:21:15 -0600
commit029eae1a7575bcb163f23a3676df1d1c7f7eb709 (patch)
tree4fcf94df28cd92aa9696e952a657cbff54d6c0d0
parentf4c53d94d2538fcd335df25754c51444896e2c2c (diff)
downloadqemu-029eae1a7575bcb163f23a3676df1d1c7f7eb709.tar.gz
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>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index bf1863e408..f01eb27ab4 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