1 files changed, 25 insertions, 22 deletions
diff --git a/instruby.rb b/instruby.rb
index c02f48cc4e..d29e8b14f8 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"
 
@@ -13,41 +15,42 @@ else
   prefix = CONFIG["prefix"]
 end
 ruby_install_name = CONFIG["ruby_install_name"]
-bindir = CONFIG["bindir"]
-libdir = CONFIG["libdir"]
+bindir = destdir+CONFIG["bindir"]
+libdir = destdir+CONFIG["libdir"]
 pkglibdir = libdir + "/" + ruby_install_name
 archdir = pkglibdir + "/" + CONFIG["arch"]
-mandir = CONFIG["mandir"] + "/man1"
+mandir = destdir+CONFIG["mandir"] + "/man1"
 wdir = Dir.getwd
 
-File.makedirs bindir, TRUE
-File.install "ruby#{binsuffix}",
-  "#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, TRUE
+File.makedirs bindir, true
+File.install ruby_install_name+binsuffix,
+  "#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, true
 for dll in Dir['*.dll']
-  File.install dll, "#{bindir}/#{dll}", 0755, TRUE
+  File.install dll, "#{bindir}/#{dll}", 0755, true
 end
 File.makedirs libdir, TRUE
 for lib in ["libruby.so", "libruby.so.LIB"]
   if File.exist? lib
-    File.install lib, "#{libdir}", 0644, TRUE
+    File.install lib, libdir, 0644, true
   end
 end
-File.makedirs pkglibdir, TRUE
-File.makedirs archdir, TRUE
+File.makedirs pkglibdir, true
+File.makedirs 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 $_, "#{pkglibdir}", 0644, TRUE
-  elsif /^[a-z]+\.h$/
-    File.install $_, "#{archdir}", 0644, TRUE
-  end
+for f in Dir["lib/*.rb"]
+  File.install f, pkglibdir, 0644, true
 end
-File.makedirs mandir, TRUE
-File.install "ruby.1", "#{mandir}", 0644, TRUE
+
+for f in Dir["*.h"]
+  File.install f, archdir, 0644, true
+end
+File.install "#{wdir}/lib#{ruby_install_name}.a", archdir, 0644, true
+
+File.makedirs mandir, true
+File.install "ruby.1", mandir, 0644, true
 Dir.chdir wdir
-File.install "config.h", "#{archdir}", 0644, TRUE
-File.install "rbconfig.rb", "#{archdir}", 0644, TRUE
+File.install "config.h", archdir, 0644, true
+File.install "rbconfig.rb", archdir, 0644, true
 # vi:set sw=2: