diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 09:07:45 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 09:07:45 +0000 |
| commit | 7761cce65eb34819384a2e24e3091440b0d634eb (patch) | |
| tree | ca2424f9f36b4433d0b6bb9365c31f3195b2b1be | |
| parent | 4345938d9df81bf5e8033c0c5598a4307126d0fa (diff) | |
| download | ruby-7761cce65eb34819384a2e24e3091440b0d634eb.tar.gz ruby-7761cce65eb34819384a2e24e3091440b0d634eb.tar.xz ruby-7761cce65eb34819384a2e24e3091440b0d634eb.zip | |
* tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
environment.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tool/compile_prelude.rb | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Nov 15 18:04:06 2007 Tanaka Akira <akr@fsij.org> + + * tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path + environment. + Thu Nov 15 17:28:21 2007 Tanaka Akira <akr@fsij.org> * tool/compile_prelude.rb: absolute path may not start with a slash. diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb index 719943444..e792b7740 100644 --- a/tool/compile_prelude.rb +++ b/tool/compile_prelude.rb @@ -33,8 +33,7 @@ lines_list = preludes.map {|filename| unless mkconf require 'rbconfig' mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}') - exlen = $:.reverse.find{|e|e!="."}.length - RbConfig::CONFIG["prefix"].length - setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.reverse.find{|e|e!=\".\"}[0..#{-exlen-1}]\n" + setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.reverse.find{|e|e!=\".\"}.sub(%r{(.*)/lib/.*}m, \"\\\\1\")\n" teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }' end if RbConfig::MAKEFILE_CONFIG.has_key? key |