summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-03 10:44:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-03 10:44:30 +0000
commitfc8c4690d5117daa9370bfc1ab30bd07387089dc (patch)
tree0a8386de058454e9d0484b6e837e97cc53bfed84
parent8e5c46c8a1cd8551d34f28196be1421e553e8948 (diff)
* configure.in (Makefile): get rid of duplicated ruby target when
already there it was. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d7faaae34..b8ab3c74e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 3 19:44:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (Makefile): get rid of duplicated ruby target when
+ already there it was.
+
Sat Oct 2 22:59:32 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_thread.rb: add for win32ole with Thread.
diff --git a/configure.in b/configure.in
index 4545023687..c7d257c995 100644
--- a/configure.in
+++ b/configure.in
@@ -2746,6 +2746,7 @@ AC_CONFIG_FILES(Makefile, [{
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi
} > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+ grep '^ruby:' Makefile > /dev/null ||
${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
echo 'ruby: $(PROGRAM);' >> Makefile],
[EXEEXT='$EXEEXT' gnumake='$gnumake'])