From fed549a10437f54588e0b1e0e9bd883d59bd37a6 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Apr 2010 02:47:07 +0000
Subject: [PATCH] Fix previous commit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 ++++-
 configure.in | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7804316968..aabff898cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 Wed Apr  7 09:44:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (Makefile): qoute init-commands.
+	* configure.in (Makefile): quote init-commands.
+
+	* configure.in (Makefile): `make ruby` builds ruby command
+	  even if RUBY_INSTALL_NAME is customized or it has extension.
 
 Wed Apr  7 03:28:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/configure.in b/configure.in
index 22990dface..da7080d64c 100644
--- a/configure.in
+++ b/configure.in
@@ -2618,7 +2618,10 @@ AC_CONFIG_FILES(Makefile, [{
 	fi
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
+	test "$RUBY_INSTALL_NAME$EXEEXT" = "$(RUBY_BASE_NAME)" ||
+	  test "$RUBY_BASE_NAME" = "" ||
+	  test "$RUBY_BASE_NAME" = "ruby" ||
+	  echo 'ruby: $(PROGRAM)'
 	if test "$gnumake" != yes; then
 	    echo ['$(MKFILES): $(srcdir)/common.mk']
 	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk