* instruby.rb: expand source library path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Jul 5, 2005 · d93e516 · d93e516
1 parent a327eb9
commit d93e516
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <[email protected]>
+
+	* instruby.rb: expand source library path.
+
 Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <[email protected]>
 
 	* array.c (sort_2): get rid of yet another bcc's bug.

diff --git a/instruby.rb b/instruby.rb
@@ -4,7 +4,7 @@
 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 @@ def install?(type)
 
 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