From 1bf35529f228c19b98fb494953c6002a800e4ed6 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Sat, 30 Oct 2010 21:13:46 -0700
Subject: Python - update bin folder in caveats

Be more specific for Framework builds about where the binaries
folder is.

Fixes #2962
---
 Library/Formula/python.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Library/Formula/python.rb')

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 4d55a791f..8d0f5bc44 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -73,11 +73,21 @@ class Python <Formula
       # If we're installed or installing as a Framework, then use that location.
       return prefix+"Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages"
     else
-      # Otherwise, use just the lib path.
+      # Otherwise use just 'lib'
       return lib+"python2.7/site-packages"
     end
   end
 
+  def exec_prefix
+    if as_framework?
+      # If we're installed or installing as a Framework, then use that location.
+      return prefix+"Frameworks/Python.framework/Versions/2.7/bin"
+    else
+      # Otherwise just use 'bin'
+      return bin
+    end
+  end
+
   def prefix_site_packages
     # The HOMEBREW_PREFIX location of site-packages
     HOMEBREW_PREFIX+"lib/python2.7/site-packages"
@@ -149,7 +159,7 @@ class Python <Formula
       If you install Python packages via pip, binaries will be installed under
       Python's cellar but not automatically linked into the Homebrew prefix.
       You may want to add Python's bin folder to your PATH as well:
-        #{bin}
+        #{exec_prefix}
     EOS
 
     s = site_caveats+general_caveats
-- 
cgit v1.2.3