diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:13:35 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:13:35 +0000 |
| commit | 22365d9c50da3733c070ea51fe6804d2f9fd91c1 (patch) | |
| tree | 2e292cf227fc6cecf4f88350ddabc65b66b08f83 | |
| parent | 6e1696743c1a5595343657230bee05db204a064c (diff) | |
merges r23655 from trunk into ruby_1_9_1.
--
* Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
4 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Jun 9 10:58:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc. + Tue Jun 2 17:32:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * enum.c (first_i): Enumerator#first should consume only what is diff --git a/Makefile.in b/Makefile.in index b0da254c71..698fb4ac9c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,6 +99,7 @@ CP = cp MV = mv RM = rm -f RMDIRS = @RMDIRS@ +RMALL = @RMALL@ NM = @NM@ AR = @AR@ ARFLAGS = rcu @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 168 +#define RUBY_PATCHLEVEL 169 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a2d9b11eab..d1190e0bc1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -66,6 +66,7 @@ AUTOCONF = autoconf IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat +RMALL = $(COMSPEC) /C rmdir /s /q CP = copy > nul MV = move > nul !if !defined(BASERUBY) |