summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--version.h2
-rw-r--r--win32/setup.mak2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1df511f2f..29e21b1fb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 24 13:55:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* ext/stringio/stringio.c (strio_getline): fix for "" as separator.
diff --git a/version.h b/version.h
index ffb0c296ac..e65b1327cd 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/win32/setup.mak b/win32/setup.mak
index 1df2e2ed33..fc5fc90f12 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
-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