From 5e39ce44fe3dfe8532d7008c66497f86d3b007b6 Mon Sep 17 00:00:00 2001
From: Camillo Lugaresi <camillo.lugaresi@gmail.com>
Date: Wed, 14 Nov 2012 14:08:34 -0600
Subject: [PATCH] separate ENV/pkgconfig dirs by OS version

Closes Homebrew/homebrew#16063.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 .../ENV/{pkgconfigLeopard => pkgconfig/leopard}/libcrypto.pc  | 0
 .../ENV/{pkgconfigLeopard => pkgconfig/leopard}/libcurl.pc    | 0
 Library/ENV/pkgconfig/{ => mountain_lion}/libcurl.pc          | 0
 Library/ENV/pkgconfig/{ => mountain_lion}/libexslt.pc         | 0
 Library/ENV/pkgconfig/{ => mountain_lion}/libxml-2.0.pc       | 0
 Library/ENV/pkgconfig/{ => mountain_lion}/libxslt.pc          | 0
 Library/Homebrew/extend/ENV.rb                                | 4 ++--
 Library/Homebrew/superenv.rb                                  | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename Library/ENV/{pkgconfigLeopard => pkgconfig/leopard}/libcrypto.pc (100%)
 rename Library/ENV/{pkgconfigLeopard => pkgconfig/leopard}/libcurl.pc (100%)
 rename Library/ENV/pkgconfig/{ => mountain_lion}/libcurl.pc (100%)
 rename Library/ENV/pkgconfig/{ => mountain_lion}/libexslt.pc (100%)
 rename Library/ENV/pkgconfig/{ => mountain_lion}/libxml-2.0.pc (100%)
 rename Library/ENV/pkgconfig/{ => mountain_lion}/libxslt.pc (100%)

diff --git a/Library/ENV/pkgconfigLeopard/libcrypto.pc b/Library/ENV/pkgconfig/leopard/libcrypto.pc
similarity index 100%
rename from Library/ENV/pkgconfigLeopard/libcrypto.pc
rename to Library/ENV/pkgconfig/leopard/libcrypto.pc
diff --git a/Library/ENV/pkgconfigLeopard/libcurl.pc b/Library/ENV/pkgconfig/leopard/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfigLeopard/libcurl.pc
rename to Library/ENV/pkgconfig/leopard/libcurl.pc
diff --git a/Library/ENV/pkgconfig/libcurl.pc b/Library/ENV/pkgconfig/mountain_lion/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/libcurl.pc
rename to Library/ENV/pkgconfig/mountain_lion/libcurl.pc
diff --git a/Library/ENV/pkgconfig/libexslt.pc b/Library/ENV/pkgconfig/mountain_lion/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/libexslt.pc
rename to 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
similarity index 100%
rename from Library/ENV/pkgconfig/libxml-2.0.pc
rename to 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
similarity index 100%
rename from Library/ENV/pkgconfig/libxslt.pc
rename to Library/ENV/pkgconfig/mountain_lion/libxslt.pc
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index d342a200b6..668fd29bd0 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 205d840f7c..e8eecb5bd9 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