Set ACLOCAL_PATH so that things work

This should mean all those formula that pass options to aclocal don't need to anymore, but I'm not risking changing them.
This commit is contained in:
Max Howell 2012-02-27 04:06:13 +00:00
parent 2049ce9f5c
commit f3d177a99b
2 changed files with 9 additions and 1 deletions

View File

@ -49,7 +49,12 @@ def install f
ENV.prepend 'LDFLAGS', "-L#{dep.lib}" ENV.prepend 'LDFLAGS', "-L#{dep.lib}"
ENV.prepend 'CPPFLAGS', "-I#{dep.include}" ENV.prepend 'CPPFLAGS', "-I#{dep.include}"
ENV.prepend 'PATH', "#{dep.bin}", ':' ENV.prepend 'PATH', "#{dep.bin}", ':'
ENV.prepend 'PKG_CONFIG_PATH', dep.lib+'pkgconfig', ':'
pcdir = dep.lib/'pkgconfig'
ENV.prepend 'PKG_CONFIG_PATH', pcdir, ':' if pcdir.directory?
acdir = dep.share/'aclocal'
ENV.prepend 'ACLOCAL_PATH', acdir, ':' if acdir.directory?
end end
end end

View File

@ -9,6 +9,9 @@ module HomebrewEnvExtension
delete('CLICOLOR_FORCE') # autotools doesn't like this delete('CLICOLOR_FORCE') # autotools doesn't like this
remove_cc_etc remove_cc_etc
# make any aclocal stuff installed in Homebrew available
ENV['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS.xcode_version < "4.3"
self['MAKEFLAGS'] = "-j#{self.make_jobs}" self['MAKEFLAGS'] = "-j#{self.make_jobs}"
unless HOMEBREW_PREFIX.to_s == '/usr/local' unless HOMEBREW_PREFIX.to_s == '/usr/local'