nobu	2013-09-30 16:07:06 +0900 (Mon, 30 Sep 2013)

  New Revision: 43093

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

  Log:
    configure.in: RUNRUBY_COMMAND
    
    * configure.in, Makefile.in (RUNRUBY_COMMAND): separate from RUNRUBY,
      to use options for runruby.rb.

  Modified files:
    trunk/Makefile.in
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 43092)
+++ configure.in	(revision 43093)
@@ -2897,7 +2897,8 @@ if test x"$cross_compiling" = xyes; then https://github.com/ruby/ruby/blob/trunk/configure.in#L2897
   AC_SUBST(XRUBY_RUBYLIBDIR)
   AC_SUBST(XRUBY_RUBYHDRDIR)
   PREP='$(arch)-fake.rb'
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY='$(RUNRUBY_COMMAND)'
   XRUBY='$(MINIRUBY)'
   TEST_RUNNABLE=no
   CROSS_COMPILING=yes
@@ -2919,7 +2920,8 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L2920
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
   MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
   PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) --'
+  RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
+  RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
@@ -2929,6 +2931,7 @@ AC_SUBST(CROSS_COMPILING) https://github.com/ruby/ruby/blob/trunk/configure.in#L2931
 AC_SUBST(MINIRUBY)
 AC_SUBST(BTESTRUBY)
 AC_SUBST(PREP)
+AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
 AC_SUBST(XRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 43092)
+++ Makefile.in	(revision 43093)
@@ -95,8 +95,11 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L95
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@\
 	$(MINIRUBYOPT)
-RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT)
-RUNRUBY = $(RUNRUBY_COMMAND) $(RUN_OPTS)
+# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
+RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
+# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
+RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
+# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
 RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
 XRUBY = @XRUBY@
 BTESTRUBY = @BTESTRUBY@\

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