From e11a1fc9b7ee5242bbb51fe8eb100e15be93abbc Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 25 May 2009 02:47:07 +0000 Subject: * tool/mkconfig.rb, tool/instruby.rb: removed redundant code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/instruby.rb | 4 ++-- tool/mkconfig.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4358718939..c36f0ccd8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon May 25 11:47:06 2009 Nobuyoshi Nakada + + * tool/mkconfig.rb, tool/instruby.rb: removed redundant code. + Mon May 25 09:34:09 2009 Yukihiro Matsumoto * 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(".") -- cgit v1.2.3