1.1c8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 15 deletions

diff --git a/instruby.rb b/instruby.rb
index 6d82c3ba17..a08fcb8d33 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -3,6 +3,8 @@
 require "rbconfig.rb"
 include Config
 
+destdir = ARGV[0] || ''
+
 $:.unshift CONFIG["srcdir"]+"/lib"
 require "ftools"
 
@@ -14,38 +16,40 @@ else
 end
 ruby_install_name = CONFIG["ruby_install_name"]
 bindir = CONFIG["bindir"]
-libdir = CONFIG["libdir"] + "/" + ruby_install_name
-archdir = libdir+"/"+CONFIG["arch"]
+libdir = CONFIG["libdir"]
+pkglibdir = libdir + "/" + ruby_install_name
+archdir = pkglibdir + "/" + CONFIG["arch"]
 mandir = CONFIG["mandir"] + "/man1"
 wdir = Dir.getwd
 
-File.makedirs bindir, TRUE
+File.makedirs "#{destdir}#{bindir}", TRUE
 File.install "ruby#{binsuffix}",
-  "#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, TRUE
+  "#{destdir}#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, TRUE
 for dll in Dir['*.dll']
-  File.install dll, "#{bindir}/#{dll}", 0755, TRUE
+  File.install dll, "#{destdir}#{bindir}/#{dll}", 0755, TRUE
 end
-File.makedirs "#{libdir}", TRUE
+File.makedirs "#{destdir}#{libdir}", TRUE
 for lib in ["libruby.so", "libruby.so.LIB"]
   if File.exist? lib
-    File.install lib, "#{libdir}", 0644, TRUE
+    File.install lib, "#{destdir}#{libdir}", 0644, TRUE
   end
 end
-File.makedirs libdir, TRUE
+File.makedirs "#{destdir}#{pkglibdir}", TRUE
+File.makedirs "#{destdir}#{archdir}", TRUE
 Dir.chdir "ext"
-system "../miniruby#{binsuffix} extmk.rb install"
+system "../miniruby#{binsuffix} extmk.rb install #{destdir}"
 Dir.chdir CONFIG["srcdir"]
 IO.foreach 'MANIFEST' do |$_|
   $_.chop!
   if /^lib/
-    File.install $_, "#{libdir}", 0644, TRUE
+    File.install $_, "#{destdir}#{pkglibdir}", 0644, TRUE
   elsif /^[a-z]+\.h$/
-    File.install $_, "#{archdir}", 0644, TRUE
+    File.install $_, "#{destdir}#{archdir}", 0644, TRUE
   end
 end
-File.makedirs mandir, TRUE
-File.install "ruby.1", "#{mandir}", 0644, TRUE
+File.makedirs "#{destdir}#{mandir}", TRUE
+File.install "ruby.1", "#{destdir}#{mandir}", 0644, TRUE
 Dir.chdir wdir
-File.install "config.h", "#{archdir}", 0644, TRUE
-File.install "rbconfig.rb", "#{archdir}", 0644, TRUE
+File.install "config.h", "#{destdir}#{archdir}", 0644, TRUE
+File.install "rbconfig.rb", "#{destdir}#{archdir}", 0644, TRUE
 # vi:set sw=2: