nobu	2013-12-05 22:18:07 +0900 (Thu, 05 Dec 2013)

  New Revision: 44019

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

  Log:
    mkmf.rb: strip destdir from prefix
    
    * 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 files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44018)
+++ ChangeLog	(revision 44019)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec  5 22:18:01 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]
+
 Thu Dec  5 21:53:29 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_or): lhs elements are prefered, so should not
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 44018)
+++ lib/mkmf.rb	(revision 44019)
@@ -1849,6 +1849,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARA https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1849
     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|

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