From b1f8358fa8940806f489b0d571f5d83b20ddec57 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 15 Nov 2013 21:25:43 -0600 Subject: [PATCH] Combine X11 path conditionals --- Library/Homebrew/extend/ENV/super.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 889ac58a0f..9fc3c17b5b 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