Am 16.08.2012 16:46, schrieb Andreas Färber: > 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. >> >> 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 <m...@tls.msk.ru> >> Cc: Corey Bryant <cor...@linux.vnet.ibm.com> >> Cc: Richa Marwaha <rmar...@linux.vnet.ibm.com> >> Cc: qemu-sta...@nongnu.org > > Ping! This patch still seems missing in master and is needed for v1.1 > and v1.2 packaging.
Ping^2! Could someone please apply this before it's too late? (optionally with less offensive wording...) Thanks, Andreas >> --- >> 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 >> > > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg