nobu	2009-10-23 07:32:39 +0900 (Fri, 23 Oct 2009)

  New Revision: 25438

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

  Log:
    * configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
      ruby without current libraries.
    
    * common.mk (rdoc): use XRUBY.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 25437)
+++ configure.in	(revision 25438)
@@ -1979,18 +1979,21 @@
   test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
   PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  XRUBY='$(MINIRUBY)'
   TEST_RUNNABLE=no
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
   MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
   PREP='miniruby$(EXEEXT)'
   RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
+  XRUBY='$(RUNRUBY)'
   TEST_RUNNABLE=yes
 fi
 AC_SUBST(TEST_RUNNABLE)
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
+AC_SUBST(XRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25437)
+++ ChangeLog	(revision 25438)
@@ -1,3 +1,10 @@
+Fri Oct 23 07:32:37 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
+	  ruby without current libraries.
+
+	* common.mk (rdoc): use XRUBY.
+
 Fri Oct 23 07:28:50 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (warnflags): use -Wextra instead of -Wall.
Index: common.mk
===================================================================
--- common.mk	(revision 25437)
+++ common.mk	(revision 25438)
@@ -350,7 +350,7 @@
 
 rdoc: $(PROGRAM) PHONY
 	@echo Generating RDoc documentation
-	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+	$(XRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
 nodoc: PHONY
 
 what-where-doc: no-install-doc
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 25437)
+++ win32/Makefile.sub	(revision 25438)
@@ -254,6 +254,11 @@
 !endif
 MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
 RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --
+!if $(CROSS_COMPILING)
+XRUBY = $(MINIRUBY)
+!else
+XRUBY = $(RUNRUBY)
+!endif
 !ifndef RUBY
 RUBY = ruby
 !endif
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 25437)
+++ Makefile.in	(revision 25438)
@@ -75,6 +75,7 @@
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
 RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
+XRUBY = @XRUBY@
 
 #### End of system configuration section. ####
 

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