nagachika	2013-03-17 23:28:56 +0900 (Sun, 17 Mar 2013)

  New Revision: 39792

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

  Log:
    merge revision(s) 39590,39592: [Backport #7991]
    
    * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
      clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
      [Bug #7698]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39791)
+++ ruby_2_0_0/ChangeLog	(revision 39792)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Mar 17 23:28:44 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
+	  [Bug #7698]
+
 Sun Mar 17 23:26:31 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
Index: ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb
===================================================================
--- ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39791)
+++ ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb	(revision 39792)
@@ -31,6 +31,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb#L31
 
     run cmd, results
 
+    destdir = ENV["DESTDIR"]
+    ENV["DESTDIR"] = nil
+
     make dest_path, results
 
     if tmp_dest
@@ -43,6 +46,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/ext/ext_conf_builder.rb#L46
     results
   ensure
     ENV["RUBYOPT"] = rubyopt
+    ENV["DESTDIR"] = destdir
     siteconf.close(true) if siteconf
     FileUtils.rm_rf tmp_dest if tmp_dest
   end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39791)
+++ ruby_2_0_0/version.h	(revision 39792)
@@ -1,6 +1,6 @@ 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-17"
-#define RUBY_PATCHLEVEL 62
+#define RUBY_PATCHLEVEL 63
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39590,39592


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