diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 18:19:07 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 18:19:07 +0000 |
commit | 53733aaab9cca47f2471371f8ea1744d8298b781 (patch) | |
tree | 5cf055dca3fd705a0f9bbe21e9eb6db1b66eda93 | |
parent | a954fc7fce17ff2b094517d9ef3221027580d5ea (diff) |
merge -c 12190
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,8 +1,11 @@ -Wed May 23 02:28:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed May 23 03:12:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (LDFLAGS): prepend -L. instead appending it to XLDFLAGS. [ruby-core:10933] + * configure.in (Makefile): remove $U for automake from MISSING. + [ruby-talk:248171] + Wed May 23 02:09:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_yield_0): should not clear state on TAG_NEXT when diff --git a/configure.in b/configure.in index 55773a62e5..6ced76363f 100644 --- a/configure.in +++ b/configure.in @@ -1639,8 +1639,10 @@ fi AC_CONFIG_FILES($FIRSTMAKEFILE) AC_CONFIG_FILES(Makefile, [{ + sed '/^MISSING/s/\$U\././g' Makefile echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);' sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk -} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT]) + } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile], +[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT]) AC_OUTPUT @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 14 +#define RUBY_PATCHLEVEL 15 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |