* 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

ChangeLog

@@ -1,3 +1,7 @@
+Sun Apr 17 22:57:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
+
 Sat Apr 16 17:01:16 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):

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