summaryrefslogtreecommitdiff
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
commit4510093e73163ab9f0e260dfd8597dc83e7da3f9 (patch)
treed0621c98ae92756505fa10916b6262103631a595
parent30be8467ce6826970dae5e1b4a5d279862109e46 (diff)
* instruby.rb: expand source library path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--instruby.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 937459e..ca4bd6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f1225a4..be011d4 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'
@@ -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