From 026066e950a826a8118cb5cfd1a338357e314718 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 24 Dec 2015 07:21:28 +0000 Subject: [PATCH] * common.mk (ripper.c): r50045 wrongly replace $(PWD) with ../.. It is the top of build directory, not topsrcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4f966e73ad..aaf79fdb6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 24 16:13:05 2015 NARUSE, Yui + + * common.mk (ripper.c): r50045 wrongly replace $(PWD) with ../.. + It is the top of build directory, not topsrcdir. + Thu Dec 24 15:02:42 2015 sorah (Shota Fukumori) * tool/vcs.rb (IO.popen): Refactor. Avoid assigning in condition. diff --git a/common.mk b/common.mk index 75892d5f67..c2bedb7902 100644 --- a/common.mk +++ b/common.mk @@ -872,7 +872,7 @@ $(srcdir)/ext/ripper/ripper.c: parse.y id.h $(Q) $(CHDIR) $(@D) && \ sed /AUTOGENERATED/q depend | \ $(exec) $(MAKE) -f - $(MFLAGS) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH=../.. \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl