summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-19 08:16:13 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-19 08:16:13 +0000
commit7c564d3e16acfbde0fe79b45896dd3b9fb6c9109 (patch)
treebd646e9fcdf13524f77412419fd44e1d4c9052b8
parentffe69c2d6ad14af6c536c7ce90fff4652c2ff27c (diff)
* win32/Makefile.sub: nmake executes the file named echo if it exists
in the PATH. reported by Kenta Murata <mrkn AT mrkn.jp> via IRC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a4a486382..c0a4f7e3a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 17:14:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub: nmake executes the file named echo if it exists
+ in the PATH. reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
+
Sat Nov 14 17:09:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (--with-opt-dir): ignore and suppress a warning.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index be679e22f3..7871a895b0 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -576,7 +576,7 @@ s,@top_srcdir@,$(srcdir),;t t
<<KEEP
miniruby$(EXEEXT):
- @echo. $(LIBS)
+ @echo $(LIBS)
@$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) -Fe$@ $(LDFLAGS)
$(LDSHARED_1)
@@ -606,7 +606,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$@ $(LDFLAGS) \