| Message ID | b52583d1e8e7c7be36f473d6c8f43514e6ae8efd.1407162425.git.ian.campbell@citrix.com |
|---|---|
| State | Accepted |
| Commit | cbe4f1df3879c861f8c79240784f4a378123babd |
| Headers | show |
Hi Ian, On 08/04/2014 03:27 PM, Ian Campbell wrote: > Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local > and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to > /usr/local/foo. > > This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to > config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. > > Reported-by: Julien Grall <julien.grall@linaro.org> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Thanks for the quick patch: Tested-by: Julien Grall <julien.grall@linaro.org> Regards, > Cc: Luis R. Rodriguez <mcgrof@suse.com> > --- > configure | 2 +- > m4/paths.m4 | 2 +- > tools/configure | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index 1ff0a44..a6efd35 100755 > --- a/configure > +++ b/configure > @@ -1850,7 +1850,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac > > > test "x$prefix" = "xNONE" && prefix=$ac_default_prefix > -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix > +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} > > BINDIR=$prefix/bin > > diff --git a/m4/paths.m4 b/m4/paths.m4 > index 717fcd1..eac50af 100644 > --- a/m4/paths.m4 > +++ b/m4/paths.m4 > @@ -1,7 +1,7 @@ > AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ > dnl expand these early so we can use this for substitutions > test "x$prefix" = "xNONE" && prefix=$ac_default_prefix > -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix > +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} > > BINDIR=$prefix/bin > AC_SUBST(BINDIR) > diff --git a/tools/configure b/tools/configure > index 7c9bbca..3830da4 100755 > --- a/tools/configure > +++ b/tools/configure > @@ -3681,7 +3681,7 @@ esac > > > test "x$prefix" = "xNONE" && prefix=$ac_default_prefix > -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix > +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} > > BINDIR=$prefix/bin > >
Ian Campbell writes ("[Xen-devel] [PATCH] autoconf: exec_prefix should default to $prefix not $ac_default_prefix"):
> Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local
> and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to
> /usr/local/foo.
>
> This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to
> config/Paths.mk.in" which tried to add code to expand exec_prefix earlier.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
On Mon, 2014-08-04 at 16:57 +0100, Ian Jackson wrote:
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Thanks, applied.
On Mon, 2014-08-04 at 16:27 +0100, Julien Grall wrote: > Hi Ian, > > On 08/04/2014 03:27 PM, Ian Campbell wrote: > > Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local > > and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to > > /usr/local/foo. > > > > This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to > > config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. > > > > Reported-by: Julien Grall <julien.grall@linaro.org> > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > Thanks for the quick patch: > > Tested-by: Julien Grall <julien.grall@linaro.org> Thanks. I forgot about this mail when I applied so I failed to insert the tag, sorry. Ian.
diff --git a/configure b/configure index 1ff0a44..a6efd35 100755 --- a/configure +++ b/configure @@ -1850,7 +1850,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin diff --git a/m4/paths.m4 b/m4/paths.m4 index 717fcd1..eac50af 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -1,7 +1,7 @@ AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ dnl expand these early so we can use this for substitutions test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin AC_SUBST(BINDIR) diff --git a/tools/configure b/tools/configure index 7c9bbca..3830da4 100755 --- a/tools/configure +++ b/tools/configure @@ -3681,7 +3681,7 @@ esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin
Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to /usr/local/foo. This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. Reported-by: Julien Grall <julien.grall@linaro.org> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Luis R. Rodriguez <mcgrof@suse.com> --- configure | 2 +- m4/paths.m4 | 2 +- tools/configure | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)