aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-21 07:12:57 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-21 07:12:57 +0000
commit90382d8aab6829ed17f53bf10627c73687544b28 (patch)
treef180bd9d5542b7c16587471bc3105128fbaf1086
parent36fbf43b09574529d7922941f64f88e5867aa894 (diff)
downloadruby-90382d8aab6829ed17f53bf10627c73687544b28.tar.gz
* win32/setup.mk: findstr doesn't exist on win9x.
fixed: [ruby-dev:27756] (written by nobu) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/setup.mak4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e1491f9584..902bd29a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 21 16:03:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/setup.mk: findstr doesn't exist on win9x.
+ fixed: [ruby-dev:27756]
+
Sun Nov 20 21:39:27 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
* regparse.c (fetch_token_in_cc): tok->escaped should be
diff --git a/win32/setup.mak b/win32/setup.mak
index 358ba61dd1..4779741752 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
@del rtname.*
-version-: nul
- @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" | findstr /v /r ^^$$ >>$(MAKEFILE)
+ @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
@@ -140,7 +140,7 @@ $(CPU) = $(PROCESSOR_LEVEL)
-epilogue-: nul
!if exist(confargs.c)
- @$(CPP) confargs.c | findstr /v /r ^^$$ >> $(MAKEFILE)
+ @$(CPP) confargs.c >> $(MAKEFILE)
@del confargs.c
!endif
@type << >>$(MAKEFILE)