shyouhei	2009-03-31 18:37:22 +0900 (Tue, 31 Mar 2009)

  New Revision: 23104

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23104

  Log:
    merge revision(s) 21750:
    * lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/mkmf.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23103)
+++ ruby_1_8_7/ChangeLog	(revision 23104)
@@ -1,3 +1,14 @@
+Thu Mar 31 18:18:18 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (mkintpath): new function which converts native path
+	  to format acceptable in Makefile.
+
+	* lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.
+
+	* lib/mkmf.rb (configuration): convers srcdir, topdir and hdrdir.
+	  a patch by Alexey Borzenkov <snaury AT gmail.com> at
+	  [ruby-core:21448].
+
 Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (run_final): frees zombies only.  [ruby-dev:38171]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23103)
+++ ruby_1_8_7/version.h	(revision 23104)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-03-27"
+#define RUBY_RELEASE_DATE "2009-03-31"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090327
-#define RUBY_PATCHLEVEL 155
+#define RUBY_RELEASE_CODE 20090331
+#define RUBY_PATCHLEVEL 156
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 31
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/mkmf.rb
===================================================================
--- ruby_1_8_7/lib/mkmf.rb	(revision 23103)
+++ ruby_1_8_7/lib/mkmf.rb	(revision 23104)
@@ -1265,7 +1265,7 @@
       if CONFIG['target_os'] != 'cygwin'
         vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
       end
-    when 'msdosdjgpp', 'mingw32'
+    when 'msdosdjgpp'
       CONFIG['PATH_SEPARATOR'] = ';'
     end
   end

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