diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 07:40:54 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 07:40:54 +0000 |
| commit | b8eb6fded7a605982a2744a3a0fb25e740044ee8 (patch) | |
| tree | e026128e79555487a1b37531ee9fe774b909cc91 | |
| parent | dcdffdb03b0b1a1e405f2fd3c4d8a0c10a11920e (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jun 4 16:39:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other + objects. [ruby-Bugs-14228] + Tue Jun 3 16:13:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 @@ -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[]; |