From e803164d252346a9631da26de8a9460dfd411957 Mon Sep 17 00:00:00 2001
From: wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Jul 2009 19:12:23 +0000
Subject: Minor fixes to x64 sitedir/libdir.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 2 ++
 configure.in | 6 +++---
 version.h    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58c751f9f9..4f7d213651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Thu Jul 9 11:22:00 2009 Kirk Haines <khaines@ruby-lang.org>
 
 	* lib/date.rb: Removed private on to_date and to_datetime 
 
+	* configure.in: Little fixes for x64 libdir/sitedir.
+
 Mon Jun  8 12:46:00 2009  Kirk Haines <khaines@ruby-lang.org>
 
 	* lib/soap/mimemessage.rb: Fixed a typo -- conent -> content
diff --git a/configure.in b/configure.in
index ae4b67c280..bd0763831e 100644
--- a/configure.in
+++ b/configure.in
@@ -1297,7 +1297,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
     if test "$rb_cv_missing_fconvert" = yes; then
       AC_DEFINE(MISSING_FCONVERT)
     fi
-    AC_LIBOBJ([x68.o])
+    AC_LIBOBJ([x68])
     CFLAGS="$CFLAGS -fansi-only"
     XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
     EXEEXT=.x
@@ -1614,7 +1614,7 @@ case "$target_os" in
     RUBY_LIB_PREFIX="/lib/ruby"
     ;;
   *)
-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+    RUBY_LIB_PREFIX="${libdir}/ruby"
     ;;
 esac
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
@@ -1622,7 +1622,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='${prefix}/lib/ruby/site_ruby'])
+            [sitedir='${libdir}/ruby/site_ruby'])
 SITE_DIR=`eval echo \\"${sitedir}\\"`
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
diff --git a/version.h b/version.h
index 2ebd71a532..d2d83e7c30 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090608
-#define RUBY_PATCHLEVEL 374
+#define RUBY_PATCHLEVEL 375
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
-- 
cgit v1.2.3