diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Jan 17 11:06:19 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8. + Mon Jan 16 10:13:38 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item): diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 613297950d..0c48ba8bbe 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -50,7 +50,7 @@ YFLAGS = -o y.tab.c AR = lib -nologo PURIFY = AUTOCONF = autoconf -RM = $(srcdir:/=\)\win32\rm.bat +RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat !if !defined(PROCESSOR_ARCHITECTURE) PROCESSOR_ARCHITECTURE = x86 @@ -197,7 +197,7 @@ rubyw: $(WPROGRAM) !include $(srcdir)/common.mk $(MKFILES): $(srcdir)/win32/Makefile.sub $(srcdir)/win32/configure.bat $(srcdir)/win32/setup.mak - $(srcdir:/=\)\win32\configure.bat $(configure_args) + $(COMSPEC) /C $(srcdir:/=\)\win32\configure.bat $(configure_args) @echo $(MKFILES) should be updated, re-run $(MAKE). CONFIG_H = ./.config.h.time @@ -211,7 +211,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub !if exist(config.h) @copy config.h config.h.old > nul !endif - @$(srcdir:/=\)\win32\ifchange.bat config.h << + @$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h << #if _MSC_VER != $(MSC_VER) #error MSC version unmatch #endif |