From 21098905ab4fb149191a347e2c06048b870d43e1 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 6 Nov 2012 13:04:40 -0600 Subject: Fix framework install names --- Library/Homebrew/keg_fix_install_names.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb index a6d4e6843..34669da3c 100644 --- a/Library/Homebrew/keg_fix_install_names.rb +++ b/Library/Homebrew/keg_fix_install_names.rb @@ -75,19 +75,17 @@ class Keg def mach_o_files mach_o_files = [] - if (lib = join 'lib').directory? - lib.find do |pn| - next if pn.symlink? or pn.directory? - mach_o_files << pn if pn.dylib? or pn.mach_o_bundle? - end - end + dirs = %w{bin lib Frameworks} + dirs.map! { |dir| join(dir) } + dirs.reject! { |dir| not dir.directory? } - if (bin = join 'bin').directory? - bin.find do |pn| + dirs.each do |dir| + dir.find do |pn| next if pn.symlink? or pn.directory? - mach_o_files << pn if pn.mach_o_executable? + mach_o_files << pn if pn.dylib? or pn.mach_o_bundle? or pn.mach_o_executable? end end + mach_o_files end end -- cgit v1.2.3