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 <[email protected]>

---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

configure +0 -0

index 353d788..e3a1780 100755

Quoted 9 lines · Jan Kiszka

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 <[email protected]>

---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

configure echo "qemu_confdir=$qemu_confdir" >> $config_host_mak · line 3230

Quoted 10 lines

configure +1 -1

index 353d788..e3a1780 100755
@@ -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

From 58de50012972699e6bb1362ba39e3326d8f65152 Mon Sep 17 00:00:00 2001

Quoted 10 lines · Aurelien Jarno

Quoted 9 lines · Jan Kiszka

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 <[email protected]>

---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Quoted 10 lines

configure echo "qemu_confdir=$qemu_confdir" >> $config_host_mak · line 3230

Quoted 10 lines

configure +1 -1

index 353d788..e3a1780 100755
@@ -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

Somehow I missed this patch, and especially missed this case when testing initial change.

And I think this is a wrong approach too.

This should be defined as qemu_helperdir variable instead of CONFIG_QEMU_HELPERDIR, just like all other qemu_*dirs around, and scripts/create_config will take care of it by expanding the variable and providing CONFIG_QEMU_HELPERDIR #define.

Something like the attached.

Thanks,

/mjt

From 58de50012972699e6bb1362ba39e3326d8f65152 Mon Sep 17 00:00:00 2001
From: Michael Tokarev <[email protected]>
Date: Sun, 21 Oct 2012 22:52:54 +0400
Subject: [PATCH] fix CONFIG_QEMU_HELPERDIR generation again

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 <[email protected]>

---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

configure +1 -1

index 9f33c7d..fa5657f 100755
@@ -3200,7 +3200,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=\"`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

Signature · 1 line

1.7.10.4