From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SceUF-0000bh-9e for qemu-devel@nongnu.org; Thu, 07 Jun 2012 11:19:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SceUC-0001S2-V5 for qemu-devel@nongnu.org; Thu, 07 Jun 2012 11:18:58 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:40363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SceUC-0001O5-Et for qemu-devel@nongnu.org; Thu, 07 Jun 2012 11:18:56 -0400 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Jun 2012 09:18:27 -0600 Message-ID: <4FD0C60C.3000200@linux.vnet.ibm.com> Date: Thu, 07 Jun 2012 11:17:32 -0400 From: Corey Bryant MIME-Version: 1.0 References: <1339017061-7358-1-git-send-email-mjt@msgid.tls.msk.ru> In-Reply-To: <1339017061-7358-1-git-send-email-mjt@msgid.tls.msk.ru> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] use --libexecdir instead of ignoring it first and reinventing it later List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: Anthony Liguori , qemu-stable@nongnu.org, Richa Marwaha , qemu-devel@nongnu.org On 06/06/2012 05:11 PM, Michael Tokarev wrote: > 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. > Thanks for the patch and apologies for the trouble. Reviewed-by: Corey Bryant -- Regards, Corey > This patch is applicable to stable-1.1. > > Signed-off-by: Michael Tokarev > Cc: Corey Bryant > Cc: Richa Marwaha > Cc: qemu-stable@nongnu.org > --- > configure | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index 38dafec..fc86803 100755 > --- a/configure > +++ b/configure > @@ -169,6 +169,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" > @@ -598,6 +599,8 @@ for opt do > ;; > --libdir=*) libdir="$optarg" > ;; > + --libexecdir=*) libexecdir="$optarg" > + ;; > --includedir=*) includedir="$optarg" > ;; > --datadir=*) datadir="$optarg" > @@ -608,7 +611,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 > @@ -2960,6 +2963,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 > @@ -3064,14 +3068,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