summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-07 07:45:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-07 07:45:56 +0000
commit93af285b28afde8384562a87d06f95970d8a978d (patch)
treea056b2336a6cf2487efc4b071ee25841fba9fded /configure.in
parent66a425c65cef32e950200ec4000724c76217014e (diff)
* configure.in (Makefile): reverted r27244.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in10
1 files changed, 4 insertions, 6 deletions
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 }