summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-21 10:34:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-21 10:34:55 +0000
commit31f9c8c09e6f941f0587add33cbcd51cd694ac97 (patch)
tree0b750ba943b0eb5ef776349df17d796624a5c932
parent78fad83795cb2c5f6787d63cc79fc83590d5178e (diff)
* common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
* common.mk (ext/ripper/ripper.c): use $(PWD) for Unix, $(MAKEDIR) for Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--common.mk4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b093445b0..2f32cf98ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov 21 19:32:57 2014 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
+
+ * common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
+ $(MAKEDIR) for Windows.
+
Fri Nov 21 18:12:37 2014 Tanaka Akira <akr@fsij.org>
* tool/update-deps: Refactored.
diff --git a/common.mk b/common.mk
index 570aba853b..64085a41b3 100644
--- a/common.mk
+++ b/common.mk
@@ -808,8 +808,8 @@ $(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) RM="$(RM)" VPATH=../.. \
- top_srcdir=../../$(srcdir) srcdir=../../$(srcdir)/ext/ripper \
+ Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)$(MAKEDIR)" \
+ top_srcdir=../.. srcdir=. \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
$(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \