From: Ian Campbell Date: Mon, 4 Aug 2014 14:27:05 +0000 (+0100) Subject: autoconf: exec_prefix should default to $prefix not $ac_default_prefix X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4548 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbe4f1df3879c861f8c79240784f4a378123babd;p=xen.git 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 Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- diff --git a/configure b/configure index 1ff0a44d3e..a6efd3552a 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 717fcd1356..eac50afe96 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 7c9bbca8a1..3830da4ac7 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