ruby-changes:12424
From: yugui <ko1@a...>
Date: Wed, 15 Jul 2009 21:03:16 +0900 (JST)
Subject: [ruby-changes:12424] Ruby:r24124 (ruby_1_9_1): merges r24116 from trunk into ruby_1_9_1.
yugui 2009-07-15 21:01:29 +0900 (Wed, 15 Jul 2009) New Revision: 24124 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24124 Log: merges r24116 from trunk into ruby_1_9_1. -- * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/version.h branches/ruby_1_9_1/win32/Makefile.sub Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24123) +++ ruby_1_9_1/ChangeLog (revision 24124) @@ -1,3 +1,7 @@ +Wed Jul 15 16:29:35 2009 NAKAMURA Usaku <usa@r...> + + * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb. + Tue Jul 14 17:29:20 2009 NARUSE, Yui <naruse@r...> * string.c (rb_str_index_m): return nil if pos is out of string. Index: ruby_1_9_1/win32/Makefile.sub =================================================================== --- ruby_1_9_1/win32/Makefile.sub (revision 24123) +++ ruby_1_9_1/win32/Makefile.sub (revision 24124) @@ -622,7 +622,7 @@ 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 Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24123) +++ ruby_1_9_1/version.h (revision 24124) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/