From 809acc098291efb6d55e8f2fba82e7c7412ff7a5 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Jul 2009 12:01:29 +0000
Subject: merges r24116 from trunk into ruby_1_9_1. -- 	* win32/Makefile.sub
 (LIBPATHFLAG): path is already quoted in mkmf.rb.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 4 ++++
 version.h          | 2 +-
 win32/Makefile.sub | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26e329129..a51bc45c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 15 16:29:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
+
 Tue Jul 14 17:29:20 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (rb_str_index_m): return nil if pos is out of string.
diff --git a/version.h b/version.h
index 5c9b411bb..42d40522a 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 237
+#define RUBY_PATCHLEVEL 238
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d1190e0bc..064511adf 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -622,7 +622,7 @@ s,@BASERUBY@,$(BASERUBY),;t t
 s,@OUTFLAG@,$(OUTFLAG),;t t
 s,@COUTFLAG@,$(COUTFLAG),;t t
 s,@CPPOUTFILE@,-P,;t t
-s,@LIBPATHFLAG@, -libpath:"%s",;t t
+s,@LIBPATHFLAG@, -libpath:%s,;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
 s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t
-- 
cgit