diff options
| author | ilovezfs | 2016-07-16 07:41:31 -0700 |
|---|---|---|
| committer | ilovezfs | 2016-07-16 08:09:43 -0700 |
| commit | 356018501b83364ac4f41aad26ca795c3b2fb8cb (patch) | |
| tree | c9ea35c39ba805b1ccb71980e11ce2a7aa07b1a6 /Library/Homebrew/extend | |
| parent | 4b2c4ef25835a87b5bac4fb26eae91dbfed93863 (diff) | |
| download | brew-356018501b83364ac4f41aad26ca795c3b2fb8cb.tar.bz2 | |
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 <ilovezfs@icloud.com>
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 | ||||
| -rw-r--r-- | 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 0b60e2472..817b4a0ff 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 acd2efa62..1976f5312 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 |