diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-30 06:03:02 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-30 06:03:02 +0000 |
| commit | fec2e7e292d6a354007755418a33da9e29b28f34 (patch) | |
| tree | 6ab1f552bfa3e8ec0646be3dc062f71be65fdf45 | |
| parent | 3296771c5bbee084049b033acd28879328238051 (diff) | |
| download | ruby-fec2e7e292d6a354007755418a33da9e29b28f34.tar.gz | |
merge revision(s) 44756:
* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
supported by GNU make.
git-svn-id: svn+ssh://svn.ruby-lang.org/ruby/branches/ruby_2_1@44757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Jan 30 15:02:35 2014 Shugo Maeda <shugo@ruby-lang.org> + + * configure.in: use $@ instead of $(.TARGET) because .TARGET is not + supported by GNU make. + Mon Jan 27 16:49:52 2014 Kenta Murata <mrkn@mrkn.jp> * ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional diff --git a/configure.in b/configure.in index ea14b941ed..68da9e3f58 100644 --- a/configure.in +++ b/configure.in @@ -2656,7 +2656,7 @@ if test "$with_dln_a_out" != yes; then : ${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 @@ -1,10 +1,10 @@ #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" |