*** empty log message ***

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

1 files changed, 15 insertions, 15 deletions

diff --git a/instruby.rb b/instruby.rb
index 7dee03a6c1..93a6557d1f 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -13,10 +13,11 @@ else
   prefix = CONFIG["prefix"]
 end
 ruby_install_name = CONFIG["ruby_install_name"]
-bindir = prefix + "/bin"
-libdir = prefix + "/lib/" + ruby_install_name
+bindir = CONFIG["bindir"]
+libdir = CONFIG["libdir"] + "/" + ruby_install_name
 archdir = libdir+"/"+CONFIG["arch"]
-mandir = prefix + "/man/man1"
+mandir = CONFIG["mandir"] + "/man1"
+wdir = Dir.getwd
 
 File.makedirs bindir, TRUE
 File.install "ruby#{binsuffix}",
@@ -24,26 +25,25 @@ File.install "ruby#{binsuffix}",
 for dll in Dir['*.dll']
   File.install dll, "#{bindir}/#{dll}", 0755, TRUE
 end
-File.makedirs "#{prefix}/lib", TRUE
+File.makedirs "#{libdir}", TRUE
 for lib in ["libruby.so", "libruby.so.LIB"]
   if File.exist? lib
-    File.install lib, "#{prefix}/lib", 0644, TRUE
+    File.install lib, "#{libdir}", 0644, TRUE
   end
 end
 File.makedirs libdir, TRUE
 Dir.chdir "ext"
 system "../miniruby#{binsuffix} extmk.rb install"
 Dir.chdir CONFIG["srcdir"]
-IO.foreach 'MANIFEST' do |$_|
-  $_.chop!
-  if /^lib/
-    File.install $_, libdir, 0644, TRUE
-  elsif /^[a-z]+\.h$/
-    File.install $_, archdir, 0644, TRUE
-  end
-  File.install "config.h", archdir, 0644, TRUE
+for f in Dir["lib/*.rb"]
+  File.install f, "#{libdir}", 0644, TRUE
+end
+for f in Dir["*.h"]
+  File.install f, "#{archdir}", 0644, TRUE
 end
-File.install "rbconfig.rb", archdir, 0644, TRUE
 File.makedirs mandir, TRUE
-File.install "ruby.1", mandir, 0644, 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
 # vi:set sw=2: