mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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 54f28913a2 "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>
This commit is contained in:
Ian Campbell committed
1 parent
b15599e84f
commit
cbe4f1df38
3 files changed
+3
-3
No files matched your search
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
Vendored
+1
-1
@@ -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
|
||||
|
||||
|
||||