aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-05-13 10:48:13 -0500
committerJack Nagel2014-05-13 11:28:44 -0500
commitad4f4f70e77aa2219931b9942af2d41cecb2100d (patch)
tree4e491fa1d62d162e221c5c2527195809c6422e78 /Library
parentd716bf3b5fd9732e0e0aed687a297c7b180b38aa (diff)
downloadhomebrew-ad4f4f70e77aa2219931b9942af2d41cecb2100d.tar.bz2
Move method to prepare for future changes
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV/super.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 3f8968153..01ec3d084 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