diff options
| author | Jack Nagel | 2013-03-08 18:10:35 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-03-09 14:46:01 -0600 |
| commit | 878747d45881fafa64723284bb2fd769d94f722c (patch) | |
| tree | 2a73094e3f600a62c894b651978c0636a3aa272f /Library/Homebrew | |
| parent | 23575f3c7f4dc79129957f7dfb88ed11aa1619c0 (diff) | |
| download | brew-878747d45881fafa64723284bb2fd769d94f722c.tar.bz2 | |
Index pkgconfig directories by MacOS.version
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index c8b567239..ff51ced66 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -69,8 +69,7 @@ module HomebrewEnvExtension paths = [] paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig' - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/mountain_lion' if MacOS.version >= :mountain_lion - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/leopard' if MacOS.version <= :leopard + paths << HOMEBREW_REPOSITORY/"Library/ENV/pkgconfig/#{MacOS.version}" paths << '/usr/lib/pkgconfig' paths.select { |d| File.directory? d }.join(':') end diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 79e8a396b..36dead356 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -127,8 +127,7 @@ class << ENV paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" # we put our paths before X because we dupe some of the X libraries paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11? - # Mountain Lion no longer ships some .pcs; ensure we pick up our versions - paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion + paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}" paths.to_path_s end |