naruse	2014-01-30 15:03:02 +0900 (Thu, 30 Jan 2014)

  New Revision: 44757

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

  Log:
    merge revision(s) 44756:
    
    * configure.in: use $@ instead of $(.TARGET) because .TARGET is not
      supported by GNU make.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 44756)
+++ ruby_2_1/configure.in	(revision 44757)
@@ -2656,7 +2656,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2656
 			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
 			fi
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44756)
+++ ruby_2_1/ChangeLog	(revision 44757)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Jan 30 15:02:35 2014  Shugo Maeda  <shugo@r...>
+
+	* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
+	  supported by GNU make.
+
 Mon Jan 27 16:49:52 2014  Kenta Murata  <mrkn@m...>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44756)
+++ ruby_2_1/version.h	(revision 44757)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-01-27"
-#define RUBY_PATCHLEVEL 10
+#define RUBY_RELEASE_DATE "2014-01-30"
+#define RUBY_PATCHLEVEL 11
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44756


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