1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in (Makefile): reverted r27244.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-04-07 07:45:56 +00:00
parent 66a425c65c
commit 93af285b28
2 changed files with 8 additions and 6 deletions

View file

@ -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> Wed Apr 7 11:49:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rexml/quickpath.rb (REXML::QuickPath::predicate): * lib/rexml/quickpath.rb (REXML::QuickPath::predicate):

View file

@ -2618,18 +2618,16 @@ AC_CONFIG_FILES(Makefile, [{
fi fi
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' 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 if test "$gnumake" != yes; then
echo ['$(MKFILES): $(srcdir)/common.mk'] echo ['$(MKFILES): $(srcdir)/common.mk']
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
else else
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk' echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi fi
} > confmk$$.tmp && mv -f confmk$$.tmp Makefile], } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
[RUBY_INSTALL_NAME='$RUBY_INSTALL_NAME' EXEEXT='$EXEEXT' gnumake='$gnumake']) ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
echo 'ruby: $(PROGRAM);' >> Makefile],
[EXEEXT='$EXEEXT' gnumake='$gnumake'])
AC_OUTPUT AC_OUTPUT
dnl } dnl }
dnl } dnl }