ruby-changes:17884
From: usa <ko1@a...>
Date: Wed, 24 Nov 2010 13:56:31 +0900 (JST)
Subject: [ruby-changes:17884] Ruby:r29898 (ruby_1_8): merge from trunk (r29767)
usa 2010-11-24 13:56:26 +0900 (Wed, 24 Nov 2010) New Revision: 29898 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29898 Log: 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. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/win32/setup.mak Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 29897) +++ ruby_1_8/ChangeLog (revision 29898) @@ -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. + Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@n...> * ext/win32ole/win32ole.c: fix checking version of GCC. Index: ruby_1_8/win32/setup.mak =================================================================== --- ruby_1_8/win32/setup.mak (revision 29897) +++ ruby_1_8/win32/setup.mak (revision 29898) @@ -119,7 +119,7 @@ -version-: nul @$(APPEND) - @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE) + @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE) #define RUBY_REVISION 0 #include "version.h" MAJOR = RUBY_VERSION_MAJOR -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/