nobu	2008-05-11 17:57:40 +0900 (Sun, 11 May 2008)

  New Revision: 16357

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/ext/purelib.rb
    trunk/ChangeLog
    trunk/common.mk
    trunk/configure.in

  Log:
    * configure.in (MINIRUBY): should not include extension library path.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=16357&r2=16356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16357&r2=16356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16357&r2=16356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/purelib.rb?r1=16357&r2=16356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=16357&r2=16356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16357&r2=16356&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 16356)
+++ configure.in	(revision 16357)
@@ -1488,8 +1488,7 @@
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
-  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/$(arch) -I$(EXTOUT)/common'
-  MINIRUBY="$MINIRUBY"' -I./- -I$(srcdir)/ext -rpurelib.rb'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
   PREP='miniruby$(EXEEXT)'
   RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
 fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16356)
+++ ChangeLog	(revision 16357)
@@ -1,3 +1,7 @@
+Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (MINIRUBY): should not include extension library path.
+
 Sun May 11 14:40:36 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/ruby.h (SIZET2NUM): new macro.
Index: common.mk
===================================================================
--- common.mk	(revision 16356)
+++ common.mk	(revision 16357)
@@ -330,7 +330,7 @@
 
 distclean: distclean-ext distclean-local distclean-enc
 distclean-local:: clean-local
-	@$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb encdb.h
+	@$(RM) $(MKFILES) $(arch_hdrdir)/ruby/config.h rbconfig.rb yasmdata.rb encdb.h
 	@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
 	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 distclean-ext:
Index: ruby_1_8/ext/purelib.rb
===================================================================
--- ruby_1_8/ext/purelib.rb	(revision 16356)
+++ ruby_1_8/ext/purelib.rb	(revision 16357)
@@ -1,3 +1,3 @@
-if nul = $:.index("-")
+if nul = $:.find_index {|path| /\A(?:\.\/)*-\z/ =~ path}
   $:[nul..-1] = ["."]
 end
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 16356)
+++ ruby_1_8/configure.in	(revision 16357)
@@ -1402,6 +1402,7 @@
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
   PREP='miniruby$(EXEEXT)'
   RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
 fi
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16356)
+++ ruby_1_8/ChangeLog	(revision 16357)
@@ -1,3 +1,7 @@
+Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (MINIRUBY): should not include extension library path.
+
 Sun May 11 10:36:10 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* eval.c (method_name, method_owner): New methods; backported

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