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.

Reported-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/configure b/configure
index 1ff0a44d3e6e2db1e9e6d7d9bb1072ec7c0ff2ab..a6efd3552a7d1f4ec6bb0ea640a08d692ab73751 100755 (executable)
--- 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 717fcd135680395ac2912661d159275c4c60e26e..eac50afe969174f599637cd59345f82998a3582c 100644 (file)
--- 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 7c9bbca8a1a70b6a6cfdb8f9f0a532417b982ea0..3830da4ac73fd89b12f48c9a58a2c68d12906685 100755 (executable)
--- 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