diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-07 04:35:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-07 04:35:24 +0000 |
| commit | d9921b1de6aa697805f61f1c5ffda1f755fe1f90 (patch) | |
| tree | 690f42b1ccd00bdf0b1fb80f4bd306d02995a8ea /configure.in | |
| parent | 99b38e10f7d953138bb9507153ca9ae60ddd4310 (diff) | |
* common.mk (info): shows configured names.
* configure.in (Makefile): works even if RUBY_INSTALL_NAME
contains macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |