From 3a2d2af0f713c32b51b5b4a31f53829ff4ba8574 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Nov 2014 15:19:33 +0000 Subject: common.mk: fix build error * common.mk (ext/ripper/ripper.c): VPATH is always ../.. from ext/ripper. * ext/ripper/depend (.y.c): VPATH is not needed for an intermediate file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 2 +- ext/ripper/depend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 7b0f019aae..cee5dcd8ec 100644 --- a/common.mk +++ b/common.mk @@ -808,7 +808,7 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr $(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=$(PWD) \ + Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ diff --git a/ext/ripper/depend b/ext/ripper/depend index 0e0c757233..2764389b5b 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -12,7 +12,7 @@ ripper.o: ripper.c .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!$@!" $(VPATH)/y.tab.c > $@ + $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@ @$(RM) y.tab.c all: check -- cgit v1.2.3