From 63714e935a836313b16dce0e3036b747a1128d0e Mon Sep 17 00:00:00 2001
From: wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Jul 2009 15:05:27 +0000
Subject: Fixes to bignum/numeric so that infinity is always greater than any
 num. configure.in fixes to earlier breakage regarding using $libdir for
 determining lib dirs, instead of $prefix/lib.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index bd0763831e..312a842a8a 100644
--- a/configure.in
+++ b/configure.in
@@ -1323,6 +1323,10 @@ if test "$prefix" = NONE; then
   prefix=$ac_default_prefix
 fi
 
+if test "$exec_prefix" = NONE; then
+  exec_prefix=$prefix
+fi
+
 #if test "$fat_binary" != no ; then
 #  CFLAGS="$CFLAGS $ARCH_FLAG"
 #fi
@@ -1614,7 +1618,7 @@ case "$target_os" in
     RUBY_LIB_PREFIX="/lib/ruby"
     ;;
   *)
-    RUBY_LIB_PREFIX="${libdir}/ruby"
+    RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
     ;;
 esac
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
@@ -1622,7 +1626,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
-            [sitedir='${libdir}/ruby/site_ruby'])
+            [sitedir="`eval "echo ${libdir}"`/lib/ruby/site_ruby"])
 SITE_DIR=`eval echo \\"${sitedir}\\"`
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
-- 
cgit v1.2.3