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

bottle: loosen prefix grep check.

Browse Source 
/usr/local is in lots of things unrelated to Homebrew so be more specific and look for opt instead.
This commit is contained in:
Mike McQuaid 2013-09-10 21:56:39 +01:00
parent 4c55082e7c
commit 6718ca119c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/bottle.rb
View File

@ -78,7 +78,13 @@ module Homebrew extend self
# references to the Cellar e.g. Qt's QMake annoyingly does this. # references to the Cellar e.g. Qt's QMake annoyingly does this.
keg.relocate_install_names prefix, tmp_prefix, cellar, tmp_cellar keg.relocate_install_names prefix, tmp_prefix, cellar, tmp_cellar
relocatable = !keg_contains(HOMEBREW_PREFIX, keg) if prefix == '/usr/local'
prefix_check = HOMEBREW_PREFIX/'opt'
else
prefix_check = HOMEBREW_PREFIX
end
relocatable = !keg_contains(prefix_check, keg)
relocatable = !keg_contains(HOMEBREW_CELLAR, keg) if relocatable relocatable = !keg_contains(HOMEBREW_CELLAR, keg) if relocatable
# And do the same thing in reverse to change the library references # And do the same thing in reverse to change the library references