naruse	2013-04-14 03:00:25 +0900 (Sun, 14 Apr 2013)

  New Revision: 40283

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

  Log:
    * lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
      than nmke.
    
    * ext/ripper/depend: use VPATH expecting removed by above.

  Modified files:
    trunk/ChangeLog
    trunk/ext/ripper/depend
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40282)
+++ ChangeLog	(revision 40283)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr 14 02:46:50 2013  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 40282)
+++ lib/mkmf.rb	(revision 40283)
@@ -1822,7 +1822,6 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATO https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1822
 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 https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2003
     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
Index: ext/ripper/depend
===================================================================
--- ext/ripper/depend	(revision 40282)
+++ ext/ripper/depend	(revision 40283)
@@ -15,8 +15,8 @@ ripper.o: ripper.c id.c lex.c eventids1. https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L15
 	$(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

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