diff --git a/ChangeLog b/ChangeLog
index d9dbe9d083..80a391125f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Tue Apr  7 13:14:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr  7 13:35:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (info): shows configured names.
+
+	* configure.in (Makefile): works even if RUBY_INSTALL_NAME
+	  contains macro.
 
 	* configure.in (LIBRUBY_DLDFLAGS): compatibility version is
 	  ruby_version.
diff --git a/Makefile.in b/Makefile.in
index 1de779a3b8..0ebf9bd570 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,7 +159,7 @@ $(LIBRUBY_SO):
 
 fake: $(arch)-fake.rb
 $(arch)-fake.rb: config.status
-		 @./config.status --file=$@:$(srcdir)/template/fake.rb.in
+		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
diff --git a/common.mk b/common.mk
index a97ec8b471..32a7ba79ef 100644
--- a/common.mk
+++ b/common.mk
@@ -750,6 +750,16 @@ dist:
 up::
 	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
 
+info: info-program info-libruby_a info-libruby_so info-arch
+info-program:
+	@echo PROGRAM=$(PROGRAM)
+info-libruby_a:
+	@echo LIBRUBY_A=$(LIBRUBY_A)
+info-libruby_so:
+	@echo LIBRUBY_SO=$(LIBRUBY_SO)
+info-arch:
+	@echo arch=$(arch)
+
 help: PHONY
 	@echo "                Makefile of Ruby"
 	@echo ""
diff --git a/configure.in b/configure.in
index bae365fd61..cfd81d6992 100644
--- a/configure.in
+++ b/configure.in
@@ -2506,7 +2506,7 @@ 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);'
+	${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null || echo 'ruby: $(PROGRAM);'
 	if test "$gnumake" != yes; then
 	    echo ['$(MKFILES): $(srcdir)/common.mk']
 	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
@@ -2514,7 +2514,7 @@ AC_CONFIG_FILES(Makefile, [{
 	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
 	fi
       } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake])
+[EXEEXT=$EXEEXT gnumake=$gnumake])
 AC_OUTPUT
 dnl }
 dnl }