From 34f5700a0947243198dea5461b80fa8be5ba19ea Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Apr 2013 18:00:25 +0000
Subject: * lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
   than nmke.

* ext/ripper/depend: use VPATH expecting removed by above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 7 +++++++
 ext/ripper/depend | 4 ++--
 lib/mkmf.rb       | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4304a239e0..5996eddf93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr 14 02:46:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
+	  than nmke.
+
+	* ext/ripper/depend: use VPATH expecting removed by above.
+
 Sat Apr 13 23:06:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 198143ad85..db7bea74ed 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -15,8 +15,8 @@ ripper.o: ripper.c id.c lex.c eventids1.c eventids2.c eventids2table.c \
 	$(hdrdir)/ruby/util.h \
 	$(top_srcdir)/node.h \
 	$(top_srcdir)/internal.h \
-	$(disthdrdir)parse.h \
-	$(disthdrdir)id.h \
+	{$(VPATH)}parse.h \
+	{$(VPATH)}id.h \
 	$(top_srcdir)/regenc.h \
 	$(top_srcdir)/vm_opts.h \
 	$(topdir)/probes.h
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index fccef4b5ec..672b97b7ec 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1822,7 +1822,6 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
     if $extmk
-      mk << "disthdrdir = #{$nmake ? '{$(VPATH)}' : '$(top_srcdir)/'}\n"
       mk << "RUBYLIB =\n""RUBYOPT = -\n"
     end
     prefix = mkintpath(CONFIG["prefix"])
@@ -2004,6 +2003,7 @@ RULES
     end
     depend.each_line do |line|
       line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+      line.gsub!(/\{\$\(VPATH\)\}/, "") unless $nmake
       line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h)
       line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
       if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line
-- 
cgit v1.2.3