From a5e1a4b6355f4c4273998689ef0069cc92d858f3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 8 Aug 2010 15:18:46 +0000
Subject: [PATCH] * lib/mkmf.rb ($ignore_error): initialize after $nmake.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 4 ++++
 lib/mkmf.rb | 2 +-
 version.h   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b43a0d835..55b28e4a96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  9 00:18:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($ignore_error): initialize after $nmake.
+
 Sun Aug  8 19:16:26 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pathname/pathname.c (path_make_link): Pathname#make_link
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4cf84c6623..819cada514 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -17,7 +17,6 @@ SRC_EXT = %w[c m].concat(CXX_EXT)
 $static = nil
 $config_h = '$(arch_hdrdir)/ruby/config.h'
 $default_static = $static
-$ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 
 unless defined? $configure_args
   $configure_args = {}
@@ -2028,6 +2027,7 @@ when $mswin
 when $bccwin
   $nmake = ?b if /Borland/i =~ `#{make} -h`
 end
+$ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 
 RbConfig::CONFIG["srcdir"] = CONFIG["srcdir"] =
   $srcdir = arg_config("--srcdir", File.dirname($0))
diff --git a/version.h b/version.h
index afdba5ed13..92d1a90acd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-08-08"
+#define RUBY_RELEASE_DATE "2010-08-09"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"