summaryrefslogtreecommitdiff
path: root/instruby.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 14:45:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 14:45:33 +0000
commitd93e516f7802500123bdb0d7282eada3413fa29e (patch)
tree2f6193e4350f7b4302c0432d93ae16a66476499c /instruby.rb
parenta327eb95d9d82d255be1f2bcb152d5f6b6199767 (diff)
* instruby.rb: expand source library path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'instruby.rb')
-rw-r--r--instruby.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/instruby.rb b/instruby.rb
index 1db08a31f4..be011d46ab 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -4,7 +4,7 @@ load "./rbconfig.rb"
include Config
srcdir = File.dirname(__FILE__)
-$:.unshift File.join(srcdir, "lib")
+$:.unshift File.expand_path("lib", srcdir)
require 'fileutils'
require 'shellwords'
require 'optparse'
@@ -66,7 +66,7 @@ end
def install(src, dest, options = {})
options[:preserve] = true
- super src, dest, options
+ super
end
$made_dirs = {}
@@ -82,7 +82,7 @@ def makedirs(dirs)
end
def with_destdir(dir)
- return dir if $destdir.empty?
+ return dir if !$destdir or $destdir.empty?
dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
$destdir + dir
end