diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-07 02:47:07 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-07 02:47:07 +0000 |
commit | fed549a10437f54588e0b1e0e9bd883d59bd37a6 (patch) | |
tree | 870ce60b29393f1574912aaac200ced81c60a24e | |
parent | cbe2385792b720615cc82db50631ef7bfcca2d50 (diff) | |
download | ruby-fed549a10437f54588e0b1e0e9bd883d59bd37a6.tar.gz |
Fix previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,6 +1,9 @@ Wed Apr 7 09:44:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (Makefile): qoute init-commands. + * configure.in (Makefile): quote init-commands. + + * configure.in (Makefile): `make ruby` builds ruby command + even if RUBY_INSTALL_NAME is customized or it has extension. Wed Apr 7 03:28:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/configure.in b/configure.in index 22990dface..da7080d64c 100644 --- a/configure.in +++ b/configure.in @@ -2618,7 +2618,10 @@ 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);' + 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 |