diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-01-17 02:11:32 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-01-17 02:11:32 +0000 |
| commit | 1c102070bb6a473354da79210bb621f7c57bf053 (patch) | |
| tree | f49d2b8b3d4f1d7010e23df99db2fc3df6da7346 | |
| parent | ad389771062742cce0503348ad3400670883ba5b (diff) | |
* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
for nmake 8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rw-r--r-- | win32/setup.mak | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Jan 17 11:10:21 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround + for nmake 8. + Mon Jan 16 10:26:23 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 a04f614c2d..03c4fe3fb5 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -43,7 +43,7 @@ YACC = byacc 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 @@ -194,7 +194,7 @@ config.status: $(CONFIG_H) $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub @echo Creating config.h - @$(srcdir:/=\)\win32\ifchange.bat config.h << + @$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h << #if _MSC_VER != $(MSC_VER) #error MSC version unmatch #endif diff --git a/win32/setup.mak b/win32/setup.mak index 4d885b7fc4..98f72c0032 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -153,5 +153,5 @@ $(CPU) = $(PROCESSOR_LEVEL) $(BANG)include $$(srcdir)/win32/Makefile.sub << - @$(srcdir:/=\)\win32\rm.bat config.h config.status + @$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status @echo type `$(MAKE)' to make ruby for $(OS). |