diff options
| author | Camillo Lugaresi | 2012-11-14 14:08:34 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-11-19 22:04:04 -0600 |
| commit | e0d0ae92d536831d9fc0f5e03e5ca7f2a086e042 (patch) | |
| tree | 834c0ab48307c977047297bfd583a5a3df910143 /Library | |
| parent | bfc71f6450951cf4fd884b4f53998664f58a3671 (diff) | |
| download | homebrew-e0d0ae92d536831d9fc0f5e03e5ca7f2a086e042.tar.bz2 | |
separate ENV/pkgconfig dirs by OS version
Closes #16063.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/ENV/pkgconfig/leopard/libcrypto.pc (renamed from Library/ENV/pkgconfigLeopard/libcrypto.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/leopard/libcurl.pc (renamed from Library/ENV/pkgconfigLeopard/libcurl.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/mountain_lion/libcurl.pc (renamed from Library/ENV/pkgconfig/libcurl.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/mountain_lion/libexslt.pc (renamed from Library/ENV/pkgconfig/libexslt.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc (renamed from Library/ENV/pkgconfig/libxml-2.0.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/mountain_lion/libxslt.pc (renamed from Library/ENV/pkgconfig/libxslt.pc) | 0 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 2 |
8 files changed, 3 insertions, 3 deletions
diff --git a/Library/ENV/pkgconfigLeopard/libcrypto.pc b/Library/ENV/pkgconfig/leopard/libcrypto.pc index 26cd08be3..26cd08be3 100644 --- a/Library/ENV/pkgconfigLeopard/libcrypto.pc +++ b/Library/ENV/pkgconfig/leopard/libcrypto.pc diff --git a/Library/ENV/pkgconfigLeopard/libcurl.pc b/Library/ENV/pkgconfig/leopard/libcurl.pc index a93a80294..a93a80294 100644 --- a/Library/ENV/pkgconfigLeopard/libcurl.pc +++ b/Library/ENV/pkgconfig/leopard/libcurl.pc diff --git a/Library/ENV/pkgconfig/libcurl.pc b/Library/ENV/pkgconfig/mountain_lion/libcurl.pc index cb2ebf4a5..cb2ebf4a5 100644 --- a/Library/ENV/pkgconfig/libcurl.pc +++ b/Library/ENV/pkgconfig/mountain_lion/libcurl.pc diff --git a/Library/ENV/pkgconfig/libexslt.pc b/Library/ENV/pkgconfig/mountain_lion/libexslt.pc index c0b5f22da..c0b5f22da 100644 --- a/Library/ENV/pkgconfig/libexslt.pc +++ b/Library/ENV/pkgconfig/mountain_lion/libexslt.pc diff --git a/Library/ENV/pkgconfig/libxml-2.0.pc b/Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc index b2aac2a8b..b2aac2a8b 100644 --- a/Library/ENV/pkgconfig/libxml-2.0.pc +++ b/Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc diff --git a/Library/ENV/pkgconfig/libxslt.pc b/Library/ENV/pkgconfig/mountain_lion/libxslt.pc index 60fdd436c..60fdd436c 100644 --- a/Library/ENV/pkgconfig/libxslt.pc +++ b/Library/ENV/pkgconfig/mountain_lion/libxslt.pc diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index d342a200b..668fd29bd 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -67,8 +67,8 @@ module HomebrewEnvExtension paths = [] paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig' - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig' if MacOS.version >= :mountain_lion - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfigLeopard' if MacOS.version <= :leopard + 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 << '/usr/lib/pkgconfig' paths.select { |d| File.directory? d }.join(':') end diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 205d840f7..e8eecb5bd 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -121,7 +121,7 @@ class << ENV # 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" if MacOS.version >= :mountain_lion + paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion paths.to_path_s end |