ruby-changes:36450
From: nobu <ko1@a...>
Date: Sat, 22 Nov 2014 00:58:40 +0900 (JST)
Subject: [ruby-changes:36450] nobu:r48531 (trunk): common.mk: use PWD with nmake
nobu 2014-11-22 00:58:35 +0900 (Sat, 22 Nov 2014) New Revision: 48531 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48531 Log: 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. Modified files: trunk/common.mk trunk/win32/Makefile.sub Index: common.mk =================================================================== --- common.mk (revision 48530) +++ common.mk (revision 48531) @@ -808,7 +808,7 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L808 $(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)" Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 48530) +++ win32/Makefile.sub (revision 48531) @@ -8,6 +8,7 @@ NULL = nul https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L8 CHDIR = cd PATH_SEPARATOR = ; TZ = # skip timezone tests +PWD = $(MAKEDIR) !ifndef MFLAGS MFLAGS=-l -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/