From ff55e7d82e7087567c9a370817d25e1542ff31f9 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Sun, 11 Nov 2012 09:55:12 -0800 Subject: [PATCH] Move vendored .pc files to ENV Closes Homebrew/homebrew#15961. --- Library/{Homebrew => ENV}/pkgconfig/libcurl.pc | 0 Library/{Homebrew => ENV}/pkgconfig/libexslt.pc | 0 Library/{Homebrew => ENV}/pkgconfig/libxml-2.0.pc | 0 Library/{Homebrew => ENV}/pkgconfig/libxslt.pc | 0 Library/Homebrew/extend/ENV.rb | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename Library/{Homebrew => ENV}/pkgconfig/libcurl.pc (100%) rename Library/{Homebrew => ENV}/pkgconfig/libexslt.pc (100%) rename Library/{Homebrew => ENV}/pkgconfig/libxml-2.0.pc (100%) rename Library/{Homebrew => ENV}/pkgconfig/libxslt.pc (100%) diff --git a/Library/Homebrew/pkgconfig/libcurl.pc b/Library/ENV/pkgconfig/libcurl.pc similarity index 100% rename from Library/Homebrew/pkgconfig/libcurl.pc rename to Library/ENV/pkgconfig/libcurl.pc diff --git a/Library/Homebrew/pkgconfig/libexslt.pc b/Library/ENV/pkgconfig/libexslt.pc similarity index 100% rename from Library/Homebrew/pkgconfig/libexslt.pc rename to Library/ENV/pkgconfig/libexslt.pc diff --git a/Library/Homebrew/pkgconfig/libxml-2.0.pc b/Library/ENV/pkgconfig/libxml-2.0.pc similarity index 100% rename from Library/Homebrew/pkgconfig/libxml-2.0.pc rename to Library/ENV/pkgconfig/libxml-2.0.pc diff --git a/Library/Homebrew/pkgconfig/libxslt.pc b/Library/ENV/pkgconfig/libxslt.pc similarity index 100% rename from Library/Homebrew/pkgconfig/libxslt.pc rename to Library/ENV/pkgconfig/libxslt.pc diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 951506cf43..3ce1aba57c 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -68,7 +68,7 @@ module HomebrewEnvExtension paths = [] paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig' - paths << HOMEBREW_REPOSITORY/'Library/Homebrew/pkgconfig' if MacOS.version >= :mountain_lion + paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig' if MacOS.version >= :mountain_lion paths << '/usr/lib/pkgconfig' paths.select { |d| File.directory? d }.join(':') end