summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-19 11:38:46 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-19 11:38:46 +0000
commit85c464c5407675890d3855f374df23813fb7331d (patch)
tree1887989d541aae007950df9f0d70edabeb6bcae7
parent501656c4d8f8ad783d60b7dd6755d6a26cd3a7d1 (diff)
* common.mk (ext/ripper/ripper.c): use $(PWD) to get
<build-directory>/ext/ripper. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7a12d6..0728fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 20:38:11 2014 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (ext/ripper/ripper.c): use $(PWD) to get
+ <build-directory>/ext/ripper.
+
Wed Nov 19 18:12:17 2014 NARUSE, Yui <naruse@ruby-lang.org>
* tool/downloader.rb (RubyGems.download): Don't download gem if the
diff --git a/common.mk b/common.mk
index 0f9007c..43d892f 100644
--- a/common.mk
+++ b/common.mk
@@ -807,8 +807,8 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr
$(srcdir)/ext/ripper/ripper.c: parse.y id.h
$(ECHO) generating $@
- $(Q) vpath=`pwd` && $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=$(vpath) \
+ $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=$(PWD) \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl