diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-19 01:43:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-19 01:43:58 +0000 |
| commit | 54caeb378ee156c882e0996b250daa7cf4faddf3 (patch) | |
| tree | 3193cad3c94dd083043793f0caacd22e8b765557 /ext | |
| parent | a47a29e4587ccf9d00ab24a6fe0dd2b928b81f6f (diff) | |
| download | ruby-54caeb378ee156c882e0996b250daa7cf4faddf3.tar.gz ruby-54caeb378ee156c882e0996b250daa7cf4faddf3.tar.xz ruby-54caeb378ee156c882e0996b250daa7cf4faddf3.zip | |
* ext/extmk.rb (extract_makefile): remove no longer existing installed
files.
* lib/mkmf.rb (install_dirs): return installation directory list.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 6cd7ed523..af292624a 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -56,9 +56,15 @@ def extract_makefile(makefile, keep = true) newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1] target = "#{target_prefix}/#{target}" - unless (oldrb -= newrb).empty? - return false + end + unless oldrb == newrb + if $extout + newrb.each {|f| installrb.delete(f)} + config = CONFIG.dup + install_dirs(target_prefix).each {|var, val| config[var] = val} + FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true) end + return false end $target = target /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil |