setup.rb |   14 +++++++-------

 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup.rb b/setup.rb

index 424a5f3..32e7f5b 100644

--- a/setup.rb

+++ b/setup.rb

@@ -657,11 +657,11 @@ module FileOperations

   end

   def ruby(*args)

-    command config('rubyprog'), *args

+    command config('rubyprog'), *[((defined?(VENDOR_SPECIFIC) and VENDOR_SPECIFIC) ? '-rvendor-specific' : nil), *args].compact

   end

-  def make(task = nil)

-    command(*[config('makeprog'), task].compact)

+  def make(*args)

+    command(*[config('makeprog'), *args].compact)

   end

   def extdir?(dir)

@@ -768,7 +768,6 @@ class ToplevelInstaller

     config = ConfigTable.new(load_rbconfig())

     config.load_standard_entries

     config.load_multipackage_entries if multipackage?

-    config.fixup

     klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)

     klass.new(File.dirname($0), config).invoke

   end

@@ -805,6 +804,7 @@ class ToplevelInstaller

   def invoke

     run_metaconfigs

+    @config.fixup

     case task = parsearg_global()

     when nil, 'all'

       parsearg_config

@@ -1352,9 +1352,9 @@ class Installer

   def install_dir_ext(rel)

     return unless extdir?(curr_srcdir())

-    install_files rubyextentions('.'),

-                  "#{config('sodir')}/#{File.dirname(rel)}",

-                  0555

+    args = ['install']

+    args << "DESTDIR=#{@config.install_prefix}" if @config.install_prefix

+    make *args

   end

   def install_dir_data(rel)