From a3b2161c6de88bae20afd86bb033434b51be80e6 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Feb 2013 03:58:51 +0000
Subject: [PATCH] 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 6 ++++++
 lib/mkmf.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a3d5dfe9e8..284050469b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 23 12:58:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@mrkn.jp>
 
 	* backport r39321 from trunk. [ruby-core:51777] [Bug #7761]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4b6c52e3f5..70177562ed 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2343,7 +2343,7 @@ site-install-rb: install-rb
     $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