* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.

* spec/default.mspec: ditto.

* template/Doxyfile.tmpl: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-08-03 05:48:05 +00:00
parent 2fc40194d2
commit b5dc2576cc
4 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,11 @@
Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.
* spec/default.mspec: ditto.
* template/Doxyfile.tmpl: ditto.
Tue Aug 3 14:19:42 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence

View File

@ -352,7 +352,6 @@ unless CROSS_COMPILING
$ruby << " -I'$(top_srcdir)/lib'"
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
end
$mflags << "ruby=#$ruby"

View File

@ -16,7 +16,6 @@ class MSpecScript
-I#{srcdir}/lib
-I#{srcdir}/#{config['EXTOUT']}/common
-I#{srcdir}/-
-r#{srcdir}/ext/purelib.rb
#{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']}
]
end

View File

@ -9,7 +9,7 @@ end
srcdir ||= File.dirname(File.dirname(__FILE__))
load 'rbconfig.rb'
unless miniruby
miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./-'
RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir))
end
dot = RbConfig::CONFIG['DOT'] || ""