shyouhei	2008-06-04 16:40:54 +0900 (Wed, 04 Jun 2008)

  New Revision: 16804

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/Makefile.in
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13515:
    * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
      objects.  [ruby-Bugs-14228]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/Makefile.in?r1=16804&r2=16803&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16804&r2=16803&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16804&r2=16803&diff_format=u

Index: ruby_1_8_5/Makefile.in
===================================================================
--- ruby_1_8_5/Makefile.in	(revision 16803)
+++ ruby_1_8_5/Makefile.in	(revision 16804)
@@ -175,4 +175,4 @@
 	@$(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
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16803)
+++ ruby_1_8_5/ChangeLog	(revision 16804)
@@ -1,3 +1,8 @@
+Wed Jun  4 16:39:56 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16803)
+++ ruby_1_8_5/version.h	(revision 16804)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/