nobu	2010-04-07 16:45:56 +0900 (Wed, 07 Apr 2010)

  New Revision: 27247

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27247

  Log:
    * configure.in (Makefile): reverted r27244.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 27246)
+++ configure.in	(revision 27247)
@@ -2618,18 +2618,16 @@
 	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_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
 	else
 	    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'])
+    } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+	${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
+	echo 'ruby: $(PROGRAM);' >> Makefile],
+[EXEEXT='$EXEEXT' gnumake='$gnumake'])
 AC_OUTPUT
 dnl }
 dnl }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27246)
+++ ChangeLog	(revision 27247)
@@ -1,3 +1,7 @@
+Wed Apr  7 16:45:49 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (Makefile): reverted r27244.
+
 Wed Apr  7 11:49:34 2010  NARUSE, Yui  <naruse@r...>
 
 	* lib/rexml/quickpath.rb (REXML::QuickPath::predicate):

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/