merge revision(s) 21750:

	* lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@23102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ee05ec23f..9c4843e9e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Mar 31 18:18:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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:12:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (run_final): frees zombies only.  [ruby-dev:38171]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2dfd1e1501..b5bfd9e0db 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1063,7 +1063,7 @@ def configuration(srcdir)
       if CONFIG['target_os'] != 'cygwin'
         vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
       end
-    when 'msdosdjgpp', 'mingw32'
+    when 'msdosdjgpp'
       CONFIG['PATH_SEPARATOR'] = ';'
     end
   end
diff --git a/version.h b/version.h
index b24a8283ba..99d9e53849 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-03-27"
+#define RUBY_RELEASE_DATE "2009-03-31"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090327
-#define RUBY_PATCHLEVEL 367
+#define RUBY_RELEASE_CODE 20090331
+#define RUBY_PATCHLEVEL 368
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #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[];