From 54caeb378ee156c882e0996b250daa7cf4faddf3 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 19 Feb 2005 01:43:58 +0000 Subject: * 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 --- ext/extmk.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ext') 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 -- cgit