From 6718ca119c11bebb1f2d901a4ae15a2193837cf1 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 10 Sep 2013 21:56:39 +0100 Subject: [PATCH] bottle: loosen prefix grep check. /usr/local is in lots of things unrelated to Homebrew so be more specific and look for opt instead. --- Library/Homebrew/cmd/bottle.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 379ba9e931..f758cc1433 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