diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-20 22:17:46 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-21 13:05:27 +0900 |
| commit | 98c5907c653d19477e19b973cc67b97607c4ba4b (patch) | |
| tree | 5c377b84ea806f581151edc780f6e591978408e6 | |
| parent | 046f1bf492d707465c0fe90ea8bac34746c9455a (diff) | |
Ripper source on mswin
* Get rid of command substitution for cmd.exe.
* Separate RM1 command to remove single file sans directory.
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | template/Makefile.in | 1 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -1189,10 +1189,10 @@ $(REVISION_H): revision.tmp $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend $(ECHO) generating $@ - $(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \ + $(Q) $(CHDIR) $(@D) && \ sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \ $(exec) $(MAKE) -f - $(mflags) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH=../.. \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk diff --git a/template/Makefile.in b/template/Makefile.in index 666cbc3481..b0e987bba0 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -208,6 +208,7 @@ MAKEDIRS = @MKDIR_P@ CP = cp MV = mv RM = rm -f +RM1 = $(RM) RMDIR = @RMDIR@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 760f919b23..a610577603 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -89,6 +89,7 @@ RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat CP = copy > nul MV = move > nul +RM1 = del /f /q !if !defined(BASERUBY) BASERUBY = ruby !endif |