* ext/extmk.rb (parse_args): add DESTDIR only when not directed

  already.  fixed: [ruby-dev:25781]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/ext/extmk.rb b/ext/extmk.rb
index 88f5028a3..a1feb8020 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -157,6 +157,10 @@ def parse_args()
     grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
     false
   end
+  def $mflags.defined?(var)
+    grep(/\A#{var}=(.*)/) {return $1}
+    false
+  end
 
   if $mflags.set?(?n)
     $dryrun = true
@@ -165,7 +169,10 @@ def parse_args()
   end
 
   $continue = $mflags.set?(?k)
-  $mflags |= ["DESTDIR=#{$destdir}"]
+  if !$destdir.to_s.empty?
+    $destdir = File.expand_path($destdir)
+    $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
+  end
 end
 
 parse_args()