* ext/extmk.rb (extmake, parse_args): do not expand destdir.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/ext/extmk.rb b/ext/extmk.rb
index aa6200e370..2342b0ce37 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -156,6 +156,9 @@ def extmake(target)
       return true
     end
     args = sysquote($mflags)
+    unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
+      args << sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
+    end
     if $static
       args += ["static"] unless $clean
       $extlist.push [$static, $target, File.basename($target), $preload]
@@ -266,10 +269,6 @@ def parse_args()
   end
 
   $continue = $mflags.set?(?k)
-  if !$destdir.to_s.empty?
-    $destdir = File.expand_path($destdir)
-    $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
-  end
   if $extout
     $extout = '$(topdir)/'+$extout
     $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
@@ -446,6 +445,9 @@ rubies = []
 }
 
 Dir.chdir ".."
+unless $destdir.to_s.empty?
+  $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
+end
 if !$extlist.empty? and $extupdate
   rm_f(Config::CONFIG["LIBRUBY_SO"])
 end