diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-05 14:45:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-05 14:45:33 +0000 |
| commit | cd5afc1df24d024ab8cfc52dc481b1c675725074 (patch) | |
| tree | 2f6193e4350f7b4302c0432d93ae16a66476499c | |
| parent | b55aabf9f78ae47fb3702c926843642467581167 (diff) | |
| download | ruby-cd5afc1df24d024ab8cfc52dc481b1c675725074.tar.gz ruby-cd5afc1df24d024ab8cfc52dc481b1c675725074.tar.xz ruby-cd5afc1df24d024ab8cfc52dc481b1c675725074.zip | |
* instruby.rb: expand source library path.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | instruby.rb | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Jul 5 23:44:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * instruby.rb: expand source library path. + Tue Jul 5 23:27:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (sort_2): get rid of yet another bcc's bug. diff --git a/instruby.rb b/instruby.rb index 1db08a31f..be011d46a 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 |