nagachika	2013-03-06 22:14:46 +0900 (Wed, 06 Mar 2013)

  New Revision: 39616

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39616

  Log:
    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.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/tool/mkconfig.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39615)
+++ ruby_2_0_0/ChangeLog	(revision 39616)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar  6 22:13:38 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+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@r...>
 
 	* tool/merger.rb: add interaction when only ChangeLog is modified.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39615)
+++ ruby_2_0_0/version.h	(revision 39616)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 
Index: ruby_2_0_0/tool/mkconfig.rb
===================================================================
--- ruby_2_0_0/tool/mkconfig.rb	(revision 39615)
+++ ruby_2_0_0/tool/mkconfig.rb	(revision 39616)
@@ -167,7 +167,8 @@ def vars.expand(val, config = self) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/mkconfig.rb#L167
   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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39297


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/