diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-09 19:12:23 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-09 19:12:23 +0000 |
commit | c8e0720b4f930028a089f9f5d6d9f04ba2ccbbc3 (patch) | |
tree | 1b48d1fb880254c715c41efcb562e496af60ec40 | |
parent | 0cbf1eb06ba49c4d183197165a3af32d2ad121df (diff) | |
download | ruby-c8e0720b4f930028a089f9f5d6d9f04ba2ccbbc3.tar.gz ruby-c8e0720b4f930028a089f9f5d6d9f04ba2ccbbc3.tar.xz ruby-c8e0720b4f930028a089f9f5d6d9f04ba2ccbbc3.zip |
Minor fixes to x64 sitedir/libdir.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@24009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -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 ae4b67c28..bd0763831 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*) @@ -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 |