|
 |
fa00e1e |
From c56a21161425f44b2ec2d6437f1a4931c95c4345 Mon Sep 17 00:00:00 2001
|
|
|
5544c1b |
From: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
5544c1b |
Date: Thu, 7 Jun 2012 01:11:00 +0400
|
|
|
f375e62 |
Subject: [PATCH] use --libexecdir instead of ignoring it first and reinventing
|
|
|
f375e62 |
it later
|
|
|
5544c1b |
MIME-Version: 1.0
|
|
|
5544c1b |
Content-Type: text/plain; charset=UTF-8
|
|
|
5544c1b |
Content-Transfer-Encoding: 8bit
|
|
|
5544c1b |
|
|
|
5544c1b |
Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version
|
|
|
5544c1b |
of bridge helper" put the bridge helper executable into a fixed
|
|
|
5544c1b |
${prefix}/libexec/ location, instead of using ${libexecdir} for
|
|
|
5544c1b |
this. At the same time, --libexecdir is being happily ignored
|
|
|
5544c1b |
by ./configure. Even more, the same patch sets unused $libexecdir
|
|
|
5544c1b |
variable in the generated config-host.mak, and uses fixed string
|
|
|
5544c1b |
(\${prefix}/libexecdir) for the bridge helper binary.
|
|
|
5544c1b |
|
|
|
5544c1b |
Fix this braindamage by introducing $libexecdir variable, using
|
|
|
5544c1b |
it for the bridge helper binary, and recognizing --libexecdir.
|
|
|
5544c1b |
|
|
|
5544c1b |
This patch is applicable to stable-1.1.
|
|
|
5544c1b |
|
|
|
5544c1b |
Reviewed-by: Andreas Färber <afaerber@suse.de>
|
|
|
5544c1b |
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
|
|
|
5544c1b |
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
5544c1b |
Cc: Corey Bryant <coreyb@linux.vnet.ibm.com>
|
|
|
5544c1b |
Cc: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
|
|
|
5544c1b |
Cc: qemu-stable@nongnu.org
|
|
|
5544c1b |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
5544c1b |
(cherry picked from commit 8bf188aa18ef7a8355d9edbd43871d590468c4ed)
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1b |
---
|
|
|
5544c1b |
configure | 10 +++++++---
|
|
|
5544c1b |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
5544c1b |
|
|
|
5544c1b |
diff --git a/configure b/configure
|
|
|
5544c1b |
index 8874eff..d01f9dc 100755
|
|
|
5544c1b |
--- a/configure
|
|
|
5544c1b |
+++ b/configure
|
|
|
5544c1b |
@@ -191,6 +191,7 @@ datadir="\${prefix}/share"
|
|
|
5544c1b |
qemu_docdir="\${prefix}/share/doc/qemu"
|
|
|
5544c1b |
bindir="\${prefix}/bin"
|
|
|
5544c1b |
libdir="\${prefix}/lib"
|
|
|
5544c1b |
+libexecdir="\${prefix}/libexec"
|
|
|
5544c1b |
includedir="\${prefix}/include"
|
|
|
5544c1b |
sysconfdir="\${prefix}/etc"
|
|
|
5544c1b |
confsuffix="/qemu"
|
|
|
5544c1b |
@@ -624,6 +625,8 @@ for opt do
|
|
|
5544c1b |
;;
|
|
|
5544c1b |
--libdir=*) libdir="$optarg"
|
|
|
5544c1b |
;;
|
|
|
5544c1b |
+ --libexecdir=*) libexecdir="$optarg"
|
|
|
5544c1b |
+ ;;
|
|
|
5544c1b |
--includedir=*) includedir="$optarg"
|
|
|
5544c1b |
;;
|
|
|
5544c1b |
--datadir=*) datadir="$optarg"
|
|
|
5544c1b |
@@ -634,7 +637,7 @@ for opt do
|
|
|
5544c1b |
;;
|
|
|
5544c1b |
--sysconfdir=*) sysconfdir="$optarg"
|
|
|
5544c1b |
;;
|
|
|
5544c1b |
- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
|
|
|
5544c1b |
+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
|
|
|
5544c1b |
--oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
|
|
|
5544c1b |
--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
|
|
|
5544c1b |
# These switches are silently ignored, for compatibility with
|
|
|
5544c1b |
@@ -3055,6 +3058,7 @@ echo "Install prefix $prefix"
|
|
|
5544c1b |
echo "BIOS directory `eval echo $qemu_datadir`"
|
|
|
5544c1b |
echo "binary directory `eval echo $bindir`"
|
|
|
5544c1b |
echo "library directory `eval echo $libdir`"
|
|
|
5544c1b |
+echo "libexec directory `eval echo $libexecdir`"
|
|
|
5544c1b |
echo "include directory `eval echo $includedir`"
|
|
|
5544c1b |
echo "config directory `eval echo $sysconfdir`"
|
|
|
5544c1b |
if test "$mingw32" = "no" ; then
|
|
|
5544c1b |
@@ -3158,14 +3162,14 @@ echo all: >> $config_host_mak
|
|
|
5544c1b |
echo "prefix=$prefix" >> $config_host_mak
|
|
|
5544c1b |
echo "bindir=$bindir" >> $config_host_mak
|
|
|
5544c1b |
echo "libdir=$libdir" >> $config_host_mak
|
|
|
5544c1b |
+echo "libexecdir=$libexecdir" >> $config_host_mak
|
|
|
5544c1b |
echo "includedir=$includedir" >> $config_host_mak
|
|
|
5544c1b |
echo "mandir=$mandir" >> $config_host_mak
|
|
|
5544c1b |
echo "sysconfdir=$sysconfdir" >> $config_host_mak
|
|
|
5544c1b |
echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
|
|
|
5544c1b |
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
|
|
|
5544c1b |
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
|
|
|
5544c1b |
-echo "libexecdir=\${prefix}/libexec" >> $config_host_mak
|
|
|
5544c1b |
-echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak
|
|
|
5544c1b |
+echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
|
|
|
5544c1b |
|
|
|
5544c1b |
echo "ARCH=$ARCH" >> $config_host_mak
|
|
|
5544c1b |
if test "$debug_tcg" = "yes" ; then
|