Patchwork configure: Fix CONFIG_QEMU_HELPERDIR generation

login
register
mail settings
Submitter Jan Kiszka
Date Oct. 17, 2012, 5:09 p.m.
Message ID <507EE645.7040403@siemens.com>
Download mbox | patch
Permalink /patch/192108/
State New
Headers show

Comments

Jan Kiszka - Oct. 17, 2012, 5:09 p.m.
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>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Aurelien Jarno - Oct. 19, 2012, 7:33 p.m.
On Wed, Oct 17, 2012 at 07:09:25PM +0200, Jan Kiszka wrote:
> 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>
> ---
>  configure |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/configure b/configure
> index 353d788..e3a1780 100755
> --- a/configure
> +++ b/configure
> @@ -3227,7 +3227,7 @@ 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 "qemu_localstatedir=$local_statedir" >> $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

Thanks, applied.

Patch

diff --git a/configure b/configure
index 353d788..e3a1780 100755
--- a/configure
+++ b/configure
@@ -3227,7 +3227,7 @@  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 "qemu_localstatedir=$local_statedir" >> $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