From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T21Ku-0002Pi-HY for qemu-devel@nongnu.org; Thu, 16 Aug 2012 10:46:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T21Ks-0006KH-R8 for qemu-devel@nongnu.org; Thu, 16 Aug 2012 10:46:12 -0400 Message-ID: <502D07A9.4080100@suse.de> Date: Thu, 16 Aug 2012 16:46:01 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= 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-15 Content-Transfer-Encoding: quoted-printable 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: Anthony Liguori Cc: Anthony Liguori , Richa Marwaha , Corey Bryant , Michael Tokarev , qemu-stable@nongnu.org, qemu-devel@nongnu.org Am 06.06.2012 23:11, schrieb Michael Tokarev: > 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. >=20 > Fix this braindamage by introducing $libexecdir variable, using > it for the bridge helper binary, and recognizing --libexecdir. >=20 > This patch is applicable to stable-1.1. >=20 > Signed-off-by: Michael Tokarev > Cc: Corey Bryant > Cc: Richa Marwaha > Cc: qemu-stable@nongnu.org Ping! This patch still seems missing in master and is needed for v1.1 and v1.2 packaging. Andreas > --- > configure | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) >=20 > diff --git a/configure b/configure > index 38dafec..fc86803 100755 > --- a/configure > +++ b/configure > @@ -169,6 +169,7 @@ datadir=3D"\${prefix}/share" > qemu_docdir=3D"\${prefix}/share/doc/qemu" > bindir=3D"\${prefix}/bin" > libdir=3D"\${prefix}/lib" > +libexecdir=3D"\${prefix}/libexec" > includedir=3D"\${prefix}/include" > sysconfdir=3D"\${prefix}/etc" > confsuffix=3D"/qemu" > @@ -598,6 +599,8 @@ for opt do > ;; > --libdir=3D*) libdir=3D"$optarg" > ;; > + --libexecdir=3D*) libexecdir=3D"$optarg" > + ;; > --includedir=3D*) includedir=3D"$optarg" > ;; > --datadir=3D*) datadir=3D"$optarg" > @@ -608,7 +611,7 @@ for opt do > ;; > --sysconfdir=3D*) sysconfdir=3D"$optarg" > ;; > - --sbindir=3D*|--libexecdir=3D*|--sharedstatedir=3D*|--localstatedir=3D= *|\ > + --sbindir=3D*|--sharedstatedir=3D*|--localstatedir=3D*|\ > --oldincludedir=3D*|--datarootdir=3D*|--infodir=3D*|--localedir=3D*|= \ > --htmldir=3D*|--dvidir=3D*|--pdfdir=3D*|--psdir=3D*) > # 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" =3D "no" ; then > @@ -3064,14 +3068,14 @@ echo all: >> $config_host_mak > echo "prefix=3D$prefix" >> $config_host_mak > echo "bindir=3D$bindir" >> $config_host_mak > echo "libdir=3D$libdir" >> $config_host_mak > +echo "libexecdir=3D$libexecdir" >> $config_host_mak > echo "includedir=3D$includedir" >> $config_host_mak > echo "mandir=3D$mandir" >> $config_host_mak > echo "sysconfdir=3D$sysconfdir" >> $config_host_mak > echo "qemu_confdir=3D$qemu_confdir" >> $config_host_mak > echo "qemu_datadir=3D$qemu_datadir" >> $config_host_mak > echo "qemu_docdir=3D$qemu_docdir" >> $config_host_mak > -echo "libexecdir=3D\${prefix}/libexec" >> $config_host_mak > -echo "CONFIG_QEMU_HELPERDIR=3D\"$prefix/libexec\"" >> $config_host_mak > +echo "CONFIG_QEMU_HELPERDIR=3D\"$libexecdir\"" >> $config_host_mak > =20 > echo "ARCH=3D$ARCH" >> $config_host_mak > if test "$debug_tcg" =3D "yes" ; then >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg