diff options
| author | Jack Nagel | 2013-08-06 19:24:19 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-08-06 19:24:19 -0500 |
| commit | 7dfd1b3436c8516ff8f549e2487d853c83ef67a2 (patch) | |
| tree | d6ee54b9fd3c421b04bb6bd43112b05a7cb0d275 /Library | |
| parent | 772ef72d1547bc2fb3b58d246bd715c6c3e5adee (diff) | |
| download | homebrew-7dfd1b3436c8516ff8f549e2487d853c83ef67a2.tar.bz2 | |
Use MacOS::X11 path helpers
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/superenv.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 925d3381b..49469ea5f 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -156,7 +156,7 @@ class << ENV paths << "#{MacOS::Xcode.prefix}/Toolchains/XcodeDefault.xctoolchain/usr/bin" end paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } - paths << "#{MacOS::X11.prefix}/bin" if x11? + paths << MacOS::X11.bin if x11? paths += %w{/usr/bin /bin /usr/sbin /sbin} paths.to_path_s end @@ -169,7 +169,7 @@ class << ENV def determine_pkg_config_libdir paths = %W{/usr/lib/pkgconfig #{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}} - paths << "#{MacOS::X11.prefix}/lib/pkgconfig" << "#{MacOS::X11.prefix}/share/pkgconfig" if x11? + paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths.to_path_s end @@ -190,13 +190,13 @@ class << ENV def determine_cmake_include_path sdk = MacOS.sdk_path if MacOS.xcode43_without_clt? paths = [] - paths << "#{MacOS::X11.prefix}/include/freetype2" if x11? + paths << "#{MacOS::X11.include}/freetype2" if x11? paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2' if MacOS.xcode43_without_clt? paths << "#{sdk}/usr/include/apache2" end paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" unless x11? - paths << "#{MacOS::X11.prefix}/include" if x11? + paths << MacOS::X11.include if x11? paths.to_path_s end @@ -205,7 +205,7 @@ class << ENV paths = [] # things expect to find GL headers since X11 used to be a default, so we add them paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11? - paths << "#{MacOS::X11.prefix}/lib" if x11? + paths << MacOS::X11.lib if x11? paths.to_path_s end |