shyouhei	2010-11-24 16:38:35 +0900 (Wed, 24 Nov 2010)

  New Revision: 29905

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29905

  Log:
    merge revision(s) 29898:
    
    merge from trunk (r29767)
    * win32/setup.mak: use findstr.exe instead of find.exe, because all
      target build platforms should have findstr.exe, and, find.exe often
      means another command such as cygwin's.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/setup.mak

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29904)
+++ ruby_1_8_7/ChangeLog	(revision 29905)
@@ -1,3 +1,9 @@
+Wed Nov 24 13:55:21 2010  NAKAMURA Usaku  <usa@r...>
+
+	* win32/setup.mak: use findstr.exe instead of find.exe, because all
+	  target build platforms should have findstr.exe, and, find.exe often
+	  means another command such as cygwin's.
+
 Wed Nov 24 13:27:34 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* ext/stringio/stringio.c (strio_getline): fix for "" as separator.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29904)
+++ ruby_1_8_7/version.h	(revision 29905)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 321
+#define RUBY_PATCHLEVEL 322
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/win32/setup.mak
===================================================================
--- ruby_1_8_7/win32/setup.mak	(revision 29904)
+++ ruby_1_8_7/win32/setup.mak	(revision 29905)
@@ -116,7 +116,7 @@
 
 -version-: nul
 	@$(APPEND)
-	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/