shyouhei	2008-06-04 16:41:47 +0900 (Wed, 04 Jun 2008)

  New Revision: 16806

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/Makefile.in
    branches/ruby_1_8_6/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_6/ChangeLog?r1=16806&r2=16805&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16806&r2=16805&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/Makefile.in?r1=16806&r2=16805&diff_format=u

Index: ruby_1_8_6/Makefile.in
===================================================================
--- ruby_1_8_6/Makefile.in	(revision 16805)
+++ ruby_1_8_6/Makefile.in	(revision 16806)
@@ -177,4 +177,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_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16805)
+++ ruby_1_8_6/ChangeLog	(revision 16806)
@@ -1,3 +1,8 @@
+Wed Jun  4 16:41:19 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
+	  objects.  [ruby-Bugs-14228]
+
 Tue Jun  3 16:15:27 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16805)
+++ ruby_1_8_6/version.h	(revision 16806)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-06-03"
+#define RUBY_RELEASE_DATE "2008-06-04"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080603
-#define RUBY_PATCHLEVEL 123
+#define RUBY_RELEASE_CODE 20080604
+#define RUBY_PATCHLEVEL 124
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #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/