diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-21 15:58:35 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-21 15:58:35 +0000 |
| commit | 4ecdc8f54513712e5c64fc93e85c9c6dee26b90d (patch) | |
| tree | 705b58cb2ef04362eac10ebc03511e8645114bd5 | |
| parent | 31f9c8c09e6f941f0587add33cbcd51cd694ac97 (diff) | |
common.mk: use PWD with nmake
* common.mk (ext/ripper/ripper.c): move MAKEDIR to Makefile.sub.
* win32/Makefile.sub (PWD): set to $(MAKEDIR), nmake built-in macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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) RM="$(RM)" VPATH="$(PWD)$(MAKEDIR)" \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)" \ top_srcdir=../.. srcdir=. \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 9c205449a2..9045f1ec7d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -8,6 +8,7 @@ NULL = nul CHDIR = cd PATH_SEPARATOR = ; TZ = # skip timezone tests +PWD = $(MAKEDIR) !ifndef MFLAGS MFLAGS=-l |