aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-05-13 19:00:42 -0500
committerJack Nagel2012-05-13 19:28:03 -0500
commitec3615fec79043cb84dcd75da0f07cb85c8d240a (patch)
tree9bcb60842b2655e2877909d8dfc6417dd659d8fb /Library
parent210c9ac2055566bb7fd8932299b55c29f1ececee (diff)
downloadbrew-ec3615fec79043cb84dcd75da0f07cb85c8d240a.tar.bz2
doctor: rework check_pkg_config_paths
pkg-config can give us this information a colon-separated list; use that. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/doctor.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 734f38bdb..f76eef0b6 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -475,14 +475,7 @@ def check_pkg_config_paths
binary = `/usr/bin/which pkg-config`.chomp
return if binary.empty?
- # Use the debug output to determine which paths are searched
- pkg_config_paths = []
-
- debug_output = `pkg-config --debug 2>&1`
- debug_output.split("\n").each do |line|
- line =~ /Scanning directory '(.*)'/
- pkg_config_paths << $1 if $1
- end
+ pkg_config_paths = `pkg-config --variable pc_path pkg-config`.chomp.split(':')
# Check that all expected paths are being searched
unless pkg_config_paths.include? "/usr/X11/lib/pkgconfig"