diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 3f89681532..01ec3d0844 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -158,6 +158,13 @@ module Superenv paths.to_path_s end + def determine_aclocal_path + paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/aclocal" } + paths << "#{HOMEBREW_PREFIX}/share/aclocal" + paths << "#{MacOS::X11.share}/aclocal" if x11? + paths.to_path_s + end + def determine_cmake_prefix_path paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" } paths << HOMEBREW_PREFIX.to_s # put ourselves ahead of everything else @@ -195,13 +202,6 @@ module Superenv paths.to_path_s end - def determine_aclocal_path - paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/aclocal" } - paths << "#{HOMEBREW_PREFIX}/share/aclocal" - paths << "#{MacOS::X11.share}/aclocal" if x11? - paths.to_path_s - end - def determine_make_jobs if (j = self['HOMEBREW_MAKE_JOBS'].to_i) < 1 Hardware::CPU.cores