Re: [PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix

[Marc-André Lureau]

Hi

On Wed, Sep 9, 2020 at 5:15 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> On 8/26/20 1:04 PM, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
>
> Typo "separate" in subject.
>
> Btw can you copy the subject in the commit description?
> This makes review simpler (no need to go back in the
> thread view to see the subject and go back into the
> mail to see the content).

ok

>
> > Otherwise, we may accept very strange directory names...
> >
> > While at it, quote the variables.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

The patch is already merged upstream :)

>
> > ---
> >  configure | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/configure b/configure
> > index 0e04c47722..61216b9210 100755
> > --- a/configure
> > +++ b/configure
> > @@ -474,7 +474,7 @@ modules="no"
> >  module_upgrades="no"
> >  prefix="/usr/local"
> >  firmwarepath="\${prefix}/share/qemu-firmware"
> > -qemu_suffix="/qemu"
> > +qemu_suffix="qemu"
> >  slirp=""
> >  oss_lib=""
> >  bsd="no"
> > @@ -1823,12 +1823,12 @@ Advanced options (experts only):
> >    --with-git=GIT           use specified git [$git]
> >    --static                 enable static build [$static]
> >    --mandir=PATH            install man pages in PATH
> > -  --datadir=PATH           install firmware in PATH$qemu_suffix
> > -  --docdir=PATH            install documentation in PATH$qemu_suffix
> > +  --datadir=PATH           install firmware in PATH/$qemu_suffix
> > +  --docdir=PATH            install documentation in PATH/$qemu_suffix
> >    --bindir=PATH            install binaries in PATH
> >    --libdir=PATH            install libraries in PATH
> >    --libexecdir=PATH        install helper binaries in PATH
> > -  --sysconfdir=PATH        install config in PATH$qemu_suffix
> > +  --sysconfdir=PATH        install config in PATH/$qemu_suffix
> >    --localstatedir=PATH     install local state in PATH (set at runtime on 
> > win32)
> >    --firmwarepath=PATH      search PATH for firmware files
> >    --efi-aarch64=PATH       PATH of efi file to use for aarch64 VMs.
> > @@ -6467,9 +6467,9 @@ EOF
> >      fi
> >  fi
> >
> > -qemu_confdir=$sysconfdir$qemu_suffix
> > -qemu_moddir=$libdir$qemu_suffix
> > -qemu_datadir=$datadir$qemu_suffix
> > +qemu_confdir="$sysconfdir/$qemu_suffix"
> > +qemu_moddir="$libdir/$qemu_suffix"
> > +qemu_datadir="$datadir/$qemu_suffix"
> >  qemu_localedir="$datadir/locale"
> >  qemu_icondir="$datadir/icons"
> >  qemu_desktopdir="$datadir/applications"
> >
>