From c2bd5491f2b5ec77a527ad6095c4d8e28d06b29b Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 20 Nov 2014 23:45:44 +0000
Subject: [PATCH] * common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in
 the build   directory.

* common.mk (ext/ripper/ripper.c): $(RM) was not defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 common.mk | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 908a47d2fd..c40953d640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov 21 08:42:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in the build
+	  directory.
+
+	* common.mk (ext/ripper/ripper.c): $(RM) was not defined.
+
 Fri Nov 21 00:36:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/openssl/lib/openssl/x509.rb
diff --git a/common.mk b/common.mk
index cee5dcd8ec..ca14185a02 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=../.. \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH="$(PWD)" RM="$(RM)"\
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \