aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2012-04-15 08:49:03 +1000
committerMike McQuaid2012-04-16 16:46:39 +1000
commit58a8dc32944edfa0702fec84a84fb433256d0a89 (patch)
tree62754ea277196df53eeeb060a240e590e607870b /Library
parentc2da6988796837b1ab4a6c6e322052c815d75982 (diff)
downloadhomebrew-58a8dc32944edfa0702fec84a84fb433256d0a89.tar.bz2
Fix Qt installation warnings.
PRL files are necessary in lib so whitelist them. Debian installs them too: http://packages.debian.org/squeeze/amd64/libqt4-dev/filelist
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/qt.rb7
-rw-r--r--Library/Homebrew/formula_installer.rb3
2 files changed, 7 insertions, 3 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 2b4562ebd..313fb99a6 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -94,9 +94,8 @@ class Qt < Formula
# Some config scripts will only find Qt in a "Frameworks" folder
# VirtualBox is an example of where this is needed
# See: https://github.com/mxcl/homebrew/issues/issue/745
- # TODO - surely this link can be made without the `cd`
cd prefix do
- ln_s lib, "Frameworks"
+ ln_s lib, prefix + "Frameworks"
end
# The pkg-config files installed suggest that headers can be found in the
@@ -106,6 +105,10 @@ class Qt < Formula
framework_name = File.basename(File.dirname(path), '.framework')
ln_s path.realpath, include+framework_name
end
+
+ Pathname.glob(bin + '*.app').each do |path|
+ mv path, prefix
+ end
end
def test
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 5efc22c10..38bb6aba4 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -328,10 +328,11 @@ class FormulaInstaller
return unless File.exist? f.lib
valid_libraries = %w(.a .dylib .framework .la .o .so)
+ allowed_non_libraries = %w(.jar .prl)
non_libraries = f.lib.children.select do |g|
next if g.directory?
extname = g.extname
- (extname != ".jar") and (not valid_libraries.include? extname)
+ (not allowed_non_libraries.include? extname) and (not valid_libraries.include? extname)
end
unless non_libraries.empty?