usa	2014-02-05 11:38:51 +0900 (Wed, 05 Feb 2014)

  New Revision: 44820

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

  Log:
    merge revision(s) 37905: [Backport #8757]
    
    * configure.in (opt-dir): don't use non portable flag -E of sed.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 44819)
+++ ruby_1_9_3/configure.in	(revision 44820)
@@ -2928,7 +2928,7 @@ AC_ARG_WITH(opt-dir, https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L2928
 		val=`IFS="$PATH_SEPARATOR"
 		    for dir in $withval; do
 			echo x ${LIBPATHFLAG} ${RPATHFLAG} |
-			sed -E 's/^x *//;s'"${PATH_SEPARATOR}"'%1\\$-s|%s'"${IFS}${dir}/lib${IFS}g"
+			sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
 		    done | tr '\012' ' '`
 		set +x
 		LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val"
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44819)
+++ ruby_1_9_3/ChangeLog	(revision 44820)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Feb  5 11:36:30 2014  NARUSE, Yui  <naruse@r...>
+
+	* configure.in (opt-dir): don't use non portable flag -E of sed.
+
 Thu Jan 30 20:53:42 2014  Tanaka Akira  <akr@f...>
 
 	* ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44819)
+++ ruby_1_9_3/version.h	(revision 44820)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 511
+#define RUBY_PATCHLEVEL 512
 
-#define RUBY_RELEASE_DATE "2014-01-31"
+#define RUBY_RELEASE_DATE "2014-02-05"
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37905


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