diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | tool/instruby.rb | 4 | ||||
-rwxr-xr-x | tool/mkconfig.rb | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon May 25 11:47:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/mkconfig.rb, tool/instruby.rb: removed redundant code. + Mon May 25 09:34:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_hash): avoid calling rb_enc_str_asciionly_p(). diff --git a/tool/instruby.rb b/tool/instruby.rb index 852a06d0f0..3c277720d3 100755 --- a/tool/instruby.rb +++ b/tool/instruby.rb @@ -4,9 +4,9 @@ load "./rbconfig.rb" include RbConfig $".unshift File.expand_path("./rbconfig.rb") -srcdir = File.expand_path('..', File.dirname(__FILE__)) +srcdir = File.expand_path('../..', __FILE__) unless defined?(CROSS_COMPILING) and CROSS_COMPILING - $:.replace([File.expand_path("lib", srcdir), Dir.pwd]) + $:.replace([srcdir+"/lib", Dir.pwd]) end require 'fileutils' require 'shellwords' diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index d725fe0929..116791dafe 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -4,7 +4,7 @@ $install_name ||= nil $so_name ||= nil -srcdir = File.expand_path('..', File.dirname(__FILE__)) +srcdir = File.expand_path('../..', __FILE__) $:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING) $:.unshift(".") |