merge revision(s) 39297: [Backport #8032]

	mkconfig.rb: clear exec_prefix

	* tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
  before expanding rubyarchdir to remove prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 15e56fea4c..570fc22eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar  6 22:13:38 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+merge revision(s) 39297: [Backport #8032]
+
+	* tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
+	  before expanding rubyarchdir to remove prefix.
+
 Tue Mar  5 01:20:39 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/merger.rb: add interaction when only ChangeLog is modified.
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 92c765499f..d8e9f0f3b7 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -167,7 +167,8 @@ def vars.expand(val, config = self)
   val
 end
 vars["prefix"] = ""
-prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '')
+vars["exec_prefix"] = ""
+prefix = vars.expand(vars["rubyarchdir"])
 print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print <<'ARCH' if universal
diff --git a/version.h b/version.h
index f80e05e7a1..e6f826f6dd 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-03-05"
-#define RUBY_PATCHLEVEL 19
+#define RUBY_RELEASE_DATE "2013-03-06"
+#define RUBY_PATCHLEVEL 20
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"