From 0ca0a7cf12407a7974c7bb68bf3de6d4ea74cddc Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 26 Jun 2010 02:56:41 +0000 Subject: [PATCH] * common.mk (clear-installed-list): put redirection before set command, since it seems to be handled by nmake in special way. [ruby-dev:41711] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ common.mk | 2 +- version.h | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 633f5f3e36..ce3ecf5f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 26 11:56:31 2010 Nobuyoshi Nakada + + * common.mk (clear-installed-list): put redirection before set + command, since it seems to be handled by nmake in special way. + [ruby-dev:41711] + Fri Jun 25 06:24:25 2010 Nobuyoshi Nakada * lib/un.rb (httpd): MaxClients also should be integer. diff --git a/common.mk b/common.mk index 8efdbc3dd0..d899b3c3dd 100644 --- a/common.mk +++ b/common.mk @@ -370,7 +370,7 @@ CLEAR_INSTALLED_LIST = clear-installed-list install-prereq: $(CLEAR_INSTALLED_LIST) PHONY clear-installed-list: PHONY - @set MAKE="$(MAKE)" > $(INSTALLED_LIST) + @> $(INSTALLED_LIST) set MAKE="$(MAKE)" clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout clean-local:: PHONY diff --git a/version.h b/version.h index fdd4514b3c..1f83ee1a18 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-06-25" +#define RUBY_RELEASE_DATE "2010-06-26" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h"