diff options
| author | Jack Nagel | 2013-11-15 21:25:43 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-15 21:25:43 -0600 |
| commit | b1f8358fa8940806f489b0d571f5d83b20ddec57 (patch) | |
| tree | d11e98f5a0df8b7a1789bccb288c628a7d3a8e18 /Library | |
| parent | 76b69a8eb4e47528270ad8c4c473169574650703 (diff) | |
| download | brew-b1f8358fa8940806f489b0d571f5d83b20ddec57.tar.bz2 | |
Combine X11 path conditionals
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 889ac58a0..9fc3c17b5 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -182,11 +182,10 @@ module Superenv def determine_cmake_include_path sdk = MacOS.sdk_path if MacOS::Xcode.without_clt? paths = [] - paths << "#{MacOS::X11.include}/freetype2" if x11? paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2' paths << "#{sdk}/usr/include/apache2" if MacOS::Xcode.without_clt? paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" unless x11? - paths << MacOS::X11.include if x11? + paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2" if x11? paths.to_path_s end |