aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2013-09-10 21:56:39 +0100
committerMike McQuaid2013-09-10 21:56:39 +0100
commit6718ca119c11bebb1f2d901a4ae15a2193837cf1 (patch)
tree60e17678bd39be5ed50cc24bd68980adb30370da /Library/Homebrew
parent4c55082e7c0bcf0c6bb2b1401286fda466ad3248 (diff)
downloadbrew-6718ca119c11bebb1f2d901a4ae15a2193837cf1.tar.bz2
bottle: loosen prefix grep check.
/usr/local is in lots of things unrelated to Homebrew so be more specific and look for opt instead.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/cmd/bottle.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 379ba9e93..f758cc143 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -78,7 +78,13 @@ module Homebrew extend self
# references to the Cellar e.g. Qt's QMake annoyingly does this.
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
# And do the same thing in reverse to change the library references