[前][次][番号順一覧][スレッド一覧]

ruby-changes:15355

From: naruse <ko1@a...>
Date: Wed, 7 Apr 2010 11:47:35 +0900 (JST)
Subject: [ruby-changes:15355] Ruby:r27245 (trunk): Fix previous commit.

naruse	2010-04-07 11:47:07 +0900 (Wed, 07 Apr 2010)

  New Revision: 27245

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27245

  Log:
    Fix previous commit.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 27244)
+++ configure.in	(revision 27245)
@@ -2618,7 +2618,10 @@
 	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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27244)
+++ ChangeLog	(revision 27245)
@@ -1,7 +1,10 @@
 Wed Apr  7 09:44:48 2010  Nobuyoshi Nakada  <nobu@r...>
 
-	* 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@r...>
 
 	* lib/rdoc/rdoc.rb (RDoc#{initialize,setup_output_dir}):

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]