From 4ecdc8f54513712e5c64fc93e85c9c6dee26b90d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Nov 2014 15:58:35 +0000
Subject: 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
---
 common.mk          | 2 +-
 win32/Makefile.sub | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 64085a41b3..84bcbbb62b 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) 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
-- 
cgit v1.2.3