From 49d37e6edc41d58208f671da0a4697a271eedb9d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 May 2013 07:15:48 +0000
Subject: verconf.h: fix for default prefix

* configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for
  default prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index ea248c5f17..540d7d2097 100644
--- a/configure.in
+++ b/configure.in
@@ -2831,18 +2831,19 @@ else
 fi
 AC_SUBST(setup)
 
-save_prefix="$prefix"
-save_exec_prefix="$exec_prefix"
-test x"$prefix" = xNONE && prefix=$ac_default_prefix
-test x"${exec_prefix}" = xNONE && exec_prefix="$prefix"
-pat=`echo "${exec_prefix}" | tr -c '\012' .`'\(.*\)'
+if test x"${exec_prefix}" != xNONE; then
+    RUBY_EXEC_PREFIX="$exec_prefix"
+elif test x"$prefix" != xNONE; then
+    RUBY_EXEC_PREFIX="$prefix"
+else
+    RUBY_EXEC_PREFIX=$ac_default_prefix
+fi
+pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
 for var in bindir libdir; do
     eval val='"$'$var'"'
-    AS_CASE(["$val"], ["${exec_prefix}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
+    AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
     eval $var='"$val"'
 done
-prefix="$save_prefix"
-exec_prefix="$save_exec_prefix"
 
 BTESTRUBY='$(MINIRUBY)'
 if test x"$cross_compiling" = xyes; then
@@ -3566,8 +3567,6 @@ AC_ARG_WITH(vendorarchdir,
 if test "${LOAD_RELATIVE+set}"; then
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
     RUBY_EXEC_PREFIX=''
-else
-    RUBY_EXEC_PREFIX="${exec_prefix}"
 fi
 
 AC_SUBST(RUBY_EXEC_PREFIX)
-- 
cgit v1.2.3