diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 8 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Wed Apr 7 16:45:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (Makefile): reverted r27244. + Wed Apr 7 11:49:34 2010 NARUSE, Yui <naruse@ruby-lang.org> * lib/rexml/quickpath.rb (REXML::QuickPath::predicate): diff --git a/configure.in b/configure.in index da7080d64c..95cb948721 100644 --- a/configure.in +++ b/configure.in @@ -2618,18 +2618,16 @@ 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_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 } |