diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-07 00:45:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-07 00:45:01 +0000 |
| commit | cbe2385792b720615cc82db50631ef7bfcca2d50 (patch) | |
| tree | da5c358e60b7245eed269dab6729f5bc71fb196d | |
| parent | 640c32ef77c03d2c927abca6f946ff332db7195d (diff) | |
* configure.in (Makefile): qoute init-commands.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Apr 7 09:44:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (Makefile): qoute init-commands. + Wed Apr 7 03:28:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rdoc/rdoc.rb (RDoc#{initialize,setup_output_dir}): diff --git a/configure.in b/configure.in index 27fbe56d98..22990dface 100644 --- a/configure.in +++ b/configure.in @@ -2618,16 +2618,15 @@ 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);' 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 && - ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null || - echo 'ruby: $(PROGRAM);' >> Makefile], -[EXEEXT=$EXEEXT gnumake=$gnumake]) + } > confmk$$.tmp && mv -f confmk$$.tmp Makefile], +[RUBY_INSTALL_NAME='$RUBY_INSTALL_NAME' EXEEXT='$EXEEXT' gnumake='$gnumake']) AC_OUTPUT dnl } dnl } |