From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH] autoconf: exec_prefix should default to $prefix not $ac_default_prefix Date: Mon, 4 Aug 2014 15:27:05 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: "Luis R. Rodriguez" , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- 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 -- 1.7.10.4