Skip to content
This repository
Browse code

separate ENV/pkgconfig dirs by OS version

Closes #16063.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information...
commit e0d0ae92d536831d9fc0f5e03e5ca7f2a086e042 1 parent bfc71f6
camillol authored November 14, 2012 jacknagel committed November 19, 2012
0  Library/ENV/pkgconfigLeopard/libcrypto.pc → Library/ENV/pkgconfig/leopard/libcrypto.pc
File renamed without changes
0  Library/ENV/pkgconfigLeopard/libcurl.pc → Library/ENV/pkgconfig/leopard/libcurl.pc
File renamed without changes
0  Library/ENV/pkgconfig/libcurl.pc → Library/ENV/pkgconfig/mountain_lion/libcurl.pc
File renamed without changes
0  Library/ENV/pkgconfig/libexslt.pc → Library/ENV/pkgconfig/mountain_lion/libexslt.pc
File renamed without changes
0  Library/ENV/pkgconfig/libxml-2.0.pc → Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc
File renamed without changes
0  Library/ENV/pkgconfig/libxslt.pc → Library/ENV/pkgconfig/mountain_lion/libxslt.pc
File renamed without changes
4  Library/Homebrew/extend/ENV.rb
@@ -67,8 +67,8 @@ def determine_pkg_config_libdir
67 67
     paths = []
68 68
     paths << HOMEBREW_PREFIX/'lib/pkgconfig'
69 69
     paths << HOMEBREW_PREFIX/'share/pkgconfig'
70  
-    paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig' if MacOS.version >= :mountain_lion
71  
-    paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfigLeopard' if MacOS.version <= :leopard
  70
+    paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/mountain_lion' if MacOS.version >= :mountain_lion
  71
+    paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/leopard' if MacOS.version <= :leopard
72 72
     paths << '/usr/lib/pkgconfig'
73 73
     paths.select { |d| File.directory? d }.join(':')
74 74
   end
2  Library/Homebrew/superenv.rb
@@ -121,7 +121,7 @@ def determine_pkg_config_path
121 121
     # we put our paths before X because we dupe some of the X libraries
122 122
     paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11?
123 123
     # Mountain Lion no longer ships some .pcs; ensure we pick up our versions
124  
-    paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig" if MacOS.version >= :mountain_lion
  124
+    paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion
125 125
     paths.to_path_s
126 126
   end
127 127
 

0 notes on commit e0d0ae9

Please sign in to comment.
Something went wrong with that request. Please try again.