ruby-changes:18516
From: usa <ko1@a...>
Date: Fri, 14 Jan 2011 11:37:49 +0900 (JST)
Subject: [ruby-changes:18516] Ruby:r30539 (trunk): * configure.in, win32/Makefile.sub (RUNRUBY): require path should
usa 2011-01-14 11:37:34 +0900 (Fri, 14 Jan 2011) New Revision: 30539 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30539 Log: * configure.in, win32/Makefile.sub (RUNRUBY): require path should include "." because rbconfig.rb is there. Modified files: trunk/ChangeLog trunk/configure.in trunk/win32/Makefile.sub Index: configure.in =================================================================== --- configure.in (revision 30538) +++ configure.in (revision 30539) @@ -2195,7 +2195,7 @@ XRUBY='$(MINIRUBY)' TEST_RUNNABLE=no else - MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' + MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' Index: ChangeLog =================================================================== --- ChangeLog (revision 30538) +++ ChangeLog (revision 30539) @@ -1,3 +1,8 @@ +Fri Jan 14 11:36:25 2011 NAKAMURA Usaku <usa@r...> + + * configure.in, win32/Makefile.sub (RUNRUBY): require path should + include "." because rbconfig.rb is there. + Fri Jan 14 10:40:11 2011 Ryan Davis <ryan@l...> * gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4. Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 30538) +++ win32/Makefile.sub (revision 30539) @@ -263,8 +263,8 @@ MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake RUNRUBY = $(MINIRUBY) !else -MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" +MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I. +RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I. !endif MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/