summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9903c098e69..9995d083d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 17:00:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub: nmake execute the file named echo if it exists
+ in the PATH. reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
+
Thu Nov 19 02:50:47 2009 Tanaka Akira <akr@fsij.org>
* vm_eval.c (rb_search_method_entry): show the type of the hidden
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0ad8dfb0220..b49638f1207 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -738,7 +738,7 @@ s,@try_header@,try_compile,;t t
miniruby: miniruby$(EXEEXT)
miniruby$(EXEEXT):
- @echo. $(LIBS)
+ @echo $(LIBS)
$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
@$(RM) miniruby.lib miniruby.exp
miniruby.exe -v
@@ -774,7 +774,7 @@ $(LIBRUBY): $(RUBYDEF)
$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
- @echo. $(DLDOBJS)
+ @echo $(DLDOBJS)
@-$(PRE_LIBRUBY_UPDATE)
$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
$(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \