aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2013-01-20 19:44:29 -0600
committerJack Nagel2013-01-20 19:46:01 -0600
commitd4dc1bbd1531d557716d4f0da75bf2bb1e021218 (patch)
tree44ad85f25cba4965d9f551a52b43cc58b534c8e1 /Library/Homebrew
parent7f9fbe26362bb666956a1b3909eeee2c0ee0772e (diff)
downloadbrew-d4dc1bbd1531d557716d4f0da75bf2bb1e021218.tar.bz2
superenv: favor /opt/X11 over /usr/X11 when both exist
This is the order of precedence used elsewhere in Homebrew when detecting X11 versions and prefixes. Fixes Homebrew/homebrew#16598.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/superenv.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 291f9e873..9225b9608 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -290,7 +290,7 @@ module MacSystem extend self
end
def x11_prefix
- @x11_prefix ||= %W[/usr/X11 /opt/X11
+ @x11_prefix ||= %W[/opt/X11 /usr/X11
#{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
end