From bedc4d194afeda0280ab23e356f925a71cb2c581 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 22 May 2007 18:19:07 +0000 Subject: merge -c 12190 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- configure.in | 4 +++- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40a6d6b6e..931c5a1a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ -Wed May 23 02:28:35 2007 Nobuyoshi Nakada +Wed May 23 03:12:17 2007 Nobuyoshi Nakada * 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 * eval.c (rb_yield_0): should not clear state on TAG_NEXT when diff --git a/configure.in b/configure.in index 55773a62e..6ced76363 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 diff --git a/version.h b/version.h index 3e0196a62..7a69ceda6 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit