knu	2013-02-23 12:58:51 +0900 (Sat, 23 Feb 2013)

  New Revision: 39420

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

  Log:
    merge revision(s) r39290:
    
    * lib/mkmf.rb: remove extra topdir in VPATH, which was in
      win32/Makefile.sub for some reason and moved from there.
      [ruby-dev:46998] [Bug #7864]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39419)
+++ ruby_2_0_0/ChangeLog	(revision 39420)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Feb 23 12:58:32 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb: remove extra topdir in VPATH, which was in
+	  win32/Makefile.sub for some reason and moved from there.
+	  [ruby-dev:46998] [Bug #7864]
+
 Tue Feb 23 12:07:00 2013  Kenta MURATA  <mrkn@m...>
 
 	* backport r39321 from trunk. [ruby-core:51777] [Bug #7761]
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 39419)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 39420)
@@ -2343,7 +2343,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L2343
     $LIBPATH = []
     $INSTALLFILES = []
     $NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/]
-    $VPATH = %w[$(srcdir) $(topdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
+    $VPATH = %w[$(srcdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
 
     $objs = nil
     $srcs = nil

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


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