From 58b7f82c741c65961e31667656c7cc035d75eb94 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 24 Nov 2010 04:56:26 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ win32/setup.mak | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 80e85bfae3..a4438eaac6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 24 13:55:21 2010 NAKAMURA Usaku + + * 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 * ext/win32ole/win32ole.c: fix checking version of GCC. diff --git a/win32/setup.mak b/win32/setup.mak index 5772f3f2a7..a8c286a97c 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -119,7 +119,7 @@ int main(int argc, char **argv) -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