summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-17 17:29:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-17 17:29:39 +0000
commit33e76c73c93ba56f2b2b6b2d757862a6617a8217 (patch)
tree707ad5482637a29e6322d5bfc52fc7e505adf4f3
parentf0ad1d2036bb2af444120bc9a9182594a7865d1d (diff)
downloadruby-33e76c73c93ba56f2b2b6b2d757862a6617a8217.tar.gz
ruby-33e76c73c93ba56f2b2b6b2d757862a6617a8217.tar.xz
ruby-33e76c73c93ba56f2b2b6b2d757862a6617a8217.zip
* configure.in (Makefile): remove $U for automake from MISSING.
[ruby-talk:248171] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f923e36c2..885b8ce96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Wed Apr 18 02:17:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 18 02:30:24 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]
+
Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/pty/expect_sample.rb: avoid symbolic link representation for
diff --git a/configure.in b/configure.in
index c7d68fe12..58c049c27 100644
--- a/configure.in
+++ b/configure.in
@@ -1659,8 +1659,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