nagachika	2013-03-04 23:37:48 +0900 (Mon, 04 Mar 2013)

  New Revision: 39581

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

  Log:
    merge revision(s) 39284: [Backport #7860]
    
    * tool/mkconfig.rb: remove prefix from rubyarchdir.
      r39267 expands variables, it changes expansion timing,
      breaks RbConfig::CONFIG["includedir"] and building
      extension libraries with installed ruby.

  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 39580)
+++ ruby_2_0_0/ChangeLog	(revision 39581)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar  4 23:37:14 2013  NARUSE, Yui  <naruse@r...>
+
+	* tool/mkconfig.rb: remove prefix from rubyarchdir.
+	  r39267 expands variables, it changes expansion timing,
+	  breaks RbConfig::CONFIG["includedir"] and building
+	  extension libraries with installed ruby.
+
 Sun Mar  3 02:45:13 2013  Kazuki Tsujimoto  <kazuki@c...>
 
 	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39580)
+++ ruby_2_0_0/version.h	(revision 39581)
@@ -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-03"
-#define RUBY_PATCHLEVEL 10
+#define RUBY_RELEASE_DATE "2013-03-04"
+#define RUBY_PATCHLEVEL 11
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/tool/mkconfig.rb
===================================================================
--- ruby_2_0_0/tool/mkconfig.rb	(revision 39580)
+++ ruby_2_0_0/tool/mkconfig.rb	(revision 39581)
@@ -167,7 +167,7 @@ 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"])
+prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '')
 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:r39284


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