83 lines
3.2 KiB
Diff
83 lines
3.2 KiB
Diff
From 57fd4d50146ef90693d569ee799f7e9e9d606e05 Mon Sep 17 00:00:00 2001
|
|
From: Michael Tokarev <mjt@tls.msk.ru>
|
|
Date: Thu, 7 Jun 2012 01:11:00 +0400
|
|
Subject: [PATCH] use --libexecdir instead of ignoring it first and reinventing it later
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version
|
|
of bridge helper" put the bridge helper executable into a fixed
|
|
${prefix}/libexec/ location, instead of using ${libexecdir} for
|
|
this. At the same time, --libexecdir is being happily ignored
|
|
by ./configure. Even more, the same patch sets unused $libexecdir
|
|
variable in the generated config-host.mak, and uses fixed string
|
|
(\${prefix}/libexecdir) for the bridge helper binary.
|
|
|
|
Fix this braindamage by introducing $libexecdir variable, using
|
|
it for the bridge helper binary, and recognizing --libexecdir.
|
|
|
|
This patch is applicable to stable-1.1.
|
|
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
configure | 10 +++++++---
|
|
1 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index de92ac2..850821b 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -159,6 +159,7 @@ datadir="\${prefix}/share"
|
|
qemu_docdir="\${prefix}/share/doc/qemu"
|
|
bindir="\${prefix}/bin"
|
|
libdir="\${prefix}/lib"
|
|
+libexecdir="\${prefix}/libexec"
|
|
includedir="\${prefix}/include"
|
|
sysconfdir="\${prefix}/etc"
|
|
confsuffix="/qemu"
|
|
@@ -587,6 +588,8 @@ for opt do
|
|
;;
|
|
--libdir=*) libdir="$optarg"
|
|
;;
|
|
+ --libexecdir=*) libexecdir="$optarg"
|
|
+ ;;
|
|
--includedir=*) includedir="$optarg"
|
|
;;
|
|
--datadir=*) datadir="$optarg"
|
|
@@ -597,7 +600,7 @@ for opt do
|
|
;;
|
|
--sysconfdir=*) sysconfdir="$optarg"
|
|
;;
|
|
- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
|
|
+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
|
|
--oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
|
|
--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
|
|
# These switches are silently ignored, for compatibility with
|
|
@@ -2945,6 +2948,7 @@ echo "Install prefix $prefix"
|
|
echo "BIOS directory `eval echo $qemu_datadir`"
|
|
echo "binary directory `eval echo $bindir`"
|
|
echo "library directory `eval echo $libdir`"
|
|
+echo "libexec directory `eval echo $libexecdir`"
|
|
echo "include directory `eval echo $includedir`"
|
|
echo "config directory `eval echo $sysconfdir`"
|
|
if test "$mingw32" = "no" ; then
|
|
@@ -3048,14 +3052,14 @@ echo all: >> $config_host_mak
|
|
echo "prefix=$prefix" >> $config_host_mak
|
|
echo "bindir=$bindir" >> $config_host_mak
|
|
echo "libdir=$libdir" >> $config_host_mak
|
|
+echo "libexecdir=$libexecdir" >> $config_host_mak
|
|
echo "includedir=$includedir" >> $config_host_mak
|
|
echo "mandir=$mandir" >> $config_host_mak
|
|
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 "libexecdir=\${prefix}/libexec" >> $config_host_mak
|
|
-echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak
|
|
+echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
|
|
|
|
echo "ARCH=$ARCH" >> $config_host_mak
|
|
if test "$debug_tcg" = "yes" ; then
|