From 356018501b83364ac4f41aad26ca795c3b2fb8cb Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 16 Jul 2016 07:41:31 -0700 Subject: [PATCH] ENV: fix homebrew_extra_pkg_config_paths Switch to HOMEBREW_LIBRARY since HOMEBREW_LIBRARY_PATH already includes "/Homebrew" and HOMEBREW_LIBRARY is less confusing. Closes #530. Signed-off-by: ilovezfs --- Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 0b60e24725..817b4a0ff7 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -31,7 +31,7 @@ module Stdenv end def homebrew_extra_pkg_config_paths - ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] + ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] end # Sets architecture-specific flags for every environment variable diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index acd2efa625..1976f5312f 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -26,7 +26,7 @@ module Superenv # @private def homebrew_extra_pkg_config_paths paths = \ - ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] + ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths end