From b8eb6fded7a605982a2744a3a0fb25e740044ee8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 4 Jun 2008 07:40:54 +0000 Subject: merge revision(s) 13515: * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other objects. [ruby-Bugs-14228] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ Makefile.in | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07526dcbc1..b95dfea431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 4 16:39:56 2008 Nobuyoshi Nakada + + * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other + objects. [ruby-Bugs-14228] + Tue Jun 3 16:13:40 2008 Nobuyoshi Nakada * parse.y (yyerror): limit error message length. [ruby-dev:31848] diff --git a/Makefile.in b/Makefile.in index 254f1656ee..8fd59babcd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -175,4 +175,4 @@ distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c diff --git a/version.h b/version.h index 7914a85b12..c1a2ff8e09 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2008-06-03" +#define RUBY_RELEASE_DATE "2008-06-04" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20080603 -#define RUBY_PATCHLEVEL 124 +#define RUBY_RELEASE_CODE 20080604 +#define RUBY_PATCHLEVEL 125 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3