From 1f87ac7b87803c9493336dfd5fe587f44c9f8919 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 8 Dec 2010 08:09:21 +0000 Subject: merges r29693 from trunk into ruby_1_9_2. -- * common.mk (ext/ripper/ripper.c): RUBY needs to be set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index a1baf243fd..919c265b49 100644 --- a/common.mk +++ b/common.mk @@ -758,7 +758,7 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr @$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" "$(srcdir)/revision.tmp" $(EXT_SRCS): - $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. + $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. RUBY=$(BASERUBY) ## diff --git a/version.h b/version.h index 957bd3252b..630576b660 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 88 +#define RUBY_PATCHLEVEL 89 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3