nagachika	2013-12-24 00:33:01 +0900 (Tue, 24 Dec 2013)

  New Revision: 44367

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

  Log:
    merge revision(s) 44019: [Backport #9213]
    
    * lib/mkmf.rb (configuration): strip destdir part from prefix to get
      rid of duplication.  a patch by arton at [ruby-core:58859].
      [ruby-core:58856] [Bug #9213]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44366)
+++ ruby_2_0_0/ChangeLog	(revision 44367)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Dec 24 00:18:14 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (configuration): strip destdir part from prefix to get
+	  rid of duplication.  a patch by arton at [ruby-core:58859].
+	  [ruby-core:58856] [Bug #9213]
+
 Mon Dec 23 22:37:01 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (mnew_from_me): method by respond_to_missing? should be
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 44366)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 44367)
@@ -1811,6 +1811,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARA https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L1811
     prefix = mkintpath(CONFIG["prefix"])
     if destdir = prefix[$dest_prefix_pattern, 1]
       mk << "\nDESTDIR = #{destdir}\n"
+      prefix = prefix[destdir.size..-1]
     end
     mk << "prefix = #{with_destdir(prefix).unspace}\n"
     CONFIG.each do |key, var|
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44366)
+++ ruby_2_0_0/version.h	(revision 44367)
@@ -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-12-23"
-#define RUBY_PATCHLEVEL 372
+#define RUBY_RELEASE_DATE "2013-12-24"
+#define RUBY_PATCHLEVEL 373
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

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


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