diff --git a/ChangeLog b/ChangeLog index 6c171c0774..36d5c3c19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 12 10:39:08 2010 Nobuyoshi Nakada + + * configure.in (RUBY_MINGW32): canonicalize only on mingw. + Mon Oct 11 20:20:23 2010 NARUSE, Yui * lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result diff --git a/configure.in b/configure.in index 4e9f253847..2e0662a781 100644 --- a/configure.in +++ b/configure.in @@ -38,7 +38,7 @@ test "$rb_cv_mingw32" = yes && target_os="mingw32" AS_CASE(["$target_os"], [mingw*msvc], [ target_os="`echo ${target_os} | sed 's/msvc$//'`" ]) -AS_CASE(["$target_cpu"], [x86_64], [ +AS_CASE(["$target_cpu-$target_os"], [x86_64-mingw*], [ # canonicalize as like mswin version. see win32/setup.mak. target_cpu=x64 target_os="`echo ${target_os} | sed 's/32$/64/'`" diff --git a/version.h b/version.h index 257b208f2f..f771b2f04c 100644 --- a/version.h +++ b/version.h @@ -1,11 +1,11 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2010-10-11" +#define RUBY_RELEASE_DATE "2010-10-12" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h"