diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-14 02:37:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-14 02:37:34 +0000 |
| commit | 377b85f2cbdc9f9142594b1a7c1f980c92102fc9 (patch) | |
| tree | 04e42859ea3d0d370321d1e26f0fff7f0891829e | |
| parent | f52c2cc24d1070f1997921c1d870cdd55327ba2a (diff) | |
* configure.in, win32/Makefile.sub (RUNRUBY): require path should
include "." because rbconfig.rb is there.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Jan 14 11:36:25 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@lust.local> * gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4. diff --git a/configure.in b/configure.in index d42e1acac3..3f0a46375d 100644 --- a/configure.in +++ b/configure.in @@ -2195,7 +2195,7 @@ if test x"$cross_compiling" = xyes; then 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)' diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 76897902c3..2a25ccc74d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -263,8 +263,8 @@ RUBYDEF = $(RUBY_SO_NAME).def 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) -- |