diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-02 10:53:20 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-02 10:53:20 +0000 |
commit | 88c4d7df3ab72d8352e8c8460b8b37f86049ba34 (patch) | |
tree | 19ae729dd685f0ab91070c0639da1ac7c27ca863 /ext/extmk.rb | |
parent | 874e86497c945ffc03aab2eedb3758b668b707e7 (diff) |
* ext/extmk.rb (parse_args): add DESTDIR only when not directed
already. fixed: [ruby-dev:25781]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
-rw-r--r-- | ext/extmk.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 88f5028a39..a1feb80205 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() |