admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use formula opt shortcuts

Browse Source
This commit is contained in:
Jack Nagel 2014-06-30 20:23:56 -05:00
parent d792b64655
commit a3958c6d8b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/caveats.rb
View File

@ -92,11 +92,11 @@ class Caveats
if f.plist_startup
s << "To have launchd start #{f.name} at startup:"
s << " sudo mkdir -p #{destination}" unless destination_path.directory?
s << " sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
else
s << "To have launchd start #{f.name} at login:"
s << " mkdir -p #{destination}" unless destination_path.directory?
s << " ln -sfv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
s << " ln -sfv #{f.opt_prefix}/*.plist #{destination}"
end
s << "Then to load #{f.name} now:"
if f.plist_startup
@ -112,7 +112,7 @@ class Caveats
s << "To reload #{f.name} after an upgrade:"
if f.plist_startup
s << " sudo launchctl unload #{plist_link}"
s << " sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
s << " sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
s << " sudo launchctl load #{plist_link}"
else
s << " launchctl unload #{plist_link}"

4
Library/Homebrew/formula_installer.rb
View File

@ -727,8 +727,8 @@ class Formula
build variables:
EOS
s << " LDFLAGS: -L#{HOMEBREW_PREFIX}/opt/#{name}/lib\n" if lib.directory?
s << " CPPFLAGS: -I#{HOMEBREW_PREFIX}/opt/#{name}/include\n" if include.directory?
s << " LDFLAGS: -L#{opt_lib}\n" if lib.directory?
s << " CPPFLAGS: -I#{opt_include}\n" if include.directory?
end
s << "\n"
end