Put X11 last in the libpath and cpath

It was after HOMEBREW_PREFIX but not after everything else too.

1 files changed, 6 insertions, 3 deletions

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 8983b1801..96606d108 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -125,9 +125,8 @@ class << ENV
 
   def determine_cmake_prefix_path
     paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" }
+    paths << HOMEBREW_PREFIX.to_s # put ourselves ahead of everything else
     paths << "#{MacOS.sdk_path}/usr" if MacSystem.xcode43_without_clt?
-    paths << HOMEBREW_PREFIX.to_s # again always put ourselves ahead of X11
-    paths << MacSystem.x11_prefix if x11?
     paths.to_path_s
   end
 
@@ -142,13 +141,17 @@ class << ENV
       paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7"
     end
     paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/"
+    paths << "#{MacSystem.x11_prefix}/include" if x11?
     paths.to_path_s
   end
 
   def determine_cmake_library_path
     sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt?
+    paths = []
     # things expect to find GL headers since X11 used to be a default, so we add them
-    %W{#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries}.to_path_s
+    paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
+    paths << "#{MacSystem.x11_prefix}/lib" if x11?
+    paths.to_path_s
   end
 
   def determine_aclocal_path