naruse	2014-11-19 18:00:33 +0900 (Wed, 19 Nov 2014)

  New Revision: 48493

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

  Log:
    * common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
    
    * ext/ripper/depend (.y.c): use VPATH for y.tab.c.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/ext/ripper/depend
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48492)
+++ ChangeLog	(revision 48493)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov 19 17:59:25 2014  NARUSE, Yui  <naruse@r...>
+
+	* common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
+
+	* ext/ripper/depend (.y.c): use VPATH for y.tab.c.
+
 Wed Nov 19 10:07:57 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* template/prelude.c.tmpl (Prelude#translate): strip VPATH prefix
Index: common.mk
===================================================================
--- common.mk	(revision 48492)
+++ common.mk	(revision 48493)
@@ -807,8 +807,9 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L807
 
 $(srcdir)/ext/ripper/ripper.c: parse.y id.h
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
+	$(Q) vpath=`pwd` && $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=$(vpath) \
+		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
 	$(ECHO) generating $@
Index: ext/ripper/depend
===================================================================
--- ext/ripper/depend	(revision 48492)
+++ ext/ripper/depend	(revision 48493)
@@ -12,7 +12,7 @@ ripper.o: ripper.c https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L12
 .y.c:
 	$(ECHO) compiling compiler $<
 	$(Q) $(BISON) -t -v -oy.tab.c $<
-	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
+	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" $(VPATH)/y.tab.c > $@
 	@$(RM) y.tab.c
 
 all: check

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