Add frameworks helper to formula

8 files changed, 17 insertions, 20 deletions

diff --git a/Library/Formula/bullet.rb b/Library/Formula/bullet.rb
index 4b8ab5060..bbdf095b1 100644
--- a/Library/Formula/bullet.rb
+++ b/Library/Formula/bullet.rb
@@ -20,8 +20,8 @@ class Bullet < Formula
 
     if build.include? "framework"
       args << "-DBUILD_SHARED_LIBS=ON" << "-DFRAMEWORK=ON"
-      args << "-DCMAKE_INSTALL_PREFIX=#{prefix}/Frameworks"
-      args << "-DCMAKE_INSTALL_NAME_DIR=#{prefix}/Frameworks"
+      args << "-DCMAKE_INSTALL_PREFIX=#{frameworks}"
+      args << "-DCMAKE_INSTALL_NAME_DIR=#{frameworks}"
     else
       args << "-DBUILD_SHARED_LIBS=ON" if build.include? "shared"
       args << "-DCMAKE_INSTALL_PREFIX=#{prefix}"
diff --git a/Library/Formula/jstalk.rb b/Library/Formula/jstalk.rb
index 76a7296ab..2b5afa455 100644
--- a/Library/Formula/jstalk.rb
+++ b/Library/Formula/jstalk.rb
@@ -24,18 +24,18 @@ class Jstalk < Formula
     cd 'build/Release' do
       bin.install 'jstalk'
       prefix.install "JSTalk Editor.app"
-      (prefix+'Frameworks').install 'JSTalk.framework'
+      frameworks.install 'JSTalk.framework'
     end
   end
 
   def caveats; <<-EOS.undent
      Framework JSTalk was installed to:
-       #{prefix}/Frameworks/JSTalk.framework
+       #{frameworks}/JSTalk.framework
 
      You may want to symlink this Framework to a standard OS X location,
      such as:
        mkdir ~/Frameworks
-       ln -s "#{prefix}/Frameworks/JSTalk.framework" ~/Frameworks
+       ln -s "#{frameworks}/JSTalk.framework" ~/Frameworks
 
     JSTalk Editor.app was installed in:
       #{prefix}
diff --git a/Library/Formula/nu.rb b/Library/Formula/nu.rb
index 0282a18dd..9af63ecab 100644
--- a/Library/Formula/nu.rb
+++ b/Library/Formula/nu.rb
@@ -51,10 +51,10 @@ class Nu < Formula
       arch = :x86_64 if arch == :i386 && Hardware.is_64_bit?
       s.sub!(/^;;\(set @arch '\("i386"\)\)$/, "(set @arch '(\"#{arch}\"))") unless arch.nil?
       s.gsub!('(SH "sudo ', '(SH "') # don't use sudo to install
-      s.gsub!('#{@destdir}/Library/Frameworks', '#{@prefix}/Library/Frameworks')
+      s.gsub!('#{@destdir}/Library/Frameworks', '#{@frameworks}')
       s.sub! /^;; source files$/, <<-EOS
 ;; source files
-(set @framework_install_path "#{prefix}/Library/Frameworks")
+(set @framework_install_path "#{frameworks}")
 EOS
     end
     system "make"
@@ -66,14 +66,14 @@ EOS
   end
 
   def caveats
-    if self.installed? and File.exists? prefix+"Library/Frameworks/Nu.framework"
+    if self.installed? and File.exists? frameworks+"Nu.framework"
       return <<-EOS.undent
         Nu.framework was installed to:
-          #{prefix}/Library/Frameworks/Nu.framework
+          #{frameworks}/Nu.framework
 
         You may want to symlink this Framework to a standard OS X location,
         such as:
-          ln -s "#{prefix}/Library/Frameworks/Nu.framework" /Library/Frameworks
+          ln -s "#{frameworks}/Nu.framework" /Library/Frameworks
       EOS
     end
     return nil
diff --git a/Library/Formula/pyside.rb b/Library/Formula/pyside.rb
index d3c984dfd..25b8f7c1e 100644
--- a/Library/Formula/pyside.rb
+++ b/Library/Formula/pyside.rb
@@ -18,13 +18,13 @@ class Pyside < Formula
     # unless the folder containing those frameworks is added to the compiler
     # search path.
     qt = Formula.factory 'qt'
-    ENV.append_to_cflags "-F#{qt.prefix}/Frameworks"
+    ENV.append_to_cflags "-F#{qt.frameworks}"
 
     # Also need `ALTERNATIVE_QT_INCLUDE_DIR` to prevent "missing file" errors.
     # Add out of tree build because one of its deps, shiboken, itself needs an
     # out of tree build in shiboken.rb.
     args = std_cmake_args + %W[
-      -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.prefix}/Frameworks
+      -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.frameworks}
       -DSITE_PACKAGE=lib/#{which_python}/site-packages
       -DBUILD_TESTS=NO
       ..
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index a78807c59..e592c25b3 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -117,10 +117,8 @@ class Qt < Formula
     (prefix+'q3porting.xml').unlink
 
     # Some config scripts will only find Qt in a "Frameworks" folder
-    # VirtualBox is an example of where this is needed
-    # See: https://github.com/mxcl/homebrew/issues/issue/745
     cd prefix do
-      ln_s lib, prefix + "Frameworks"
+      ln_s lib, frameworks
     end
 
     # The pkg-config files installed suggest that headers can be found in the
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index fd7af3d74..6c3e729cd 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -76,10 +76,8 @@ class Qt5 < Formula
     (bin+'qhelpconverter.app').rmtree
 
     # Some config scripts will only find Qt in a "Frameworks" folder
-    # VirtualBox is an example of where this is needed
-    # See: https://github.com/mxcl/homebrew/issues/issue/745
     cd prefix do
-      ln_s lib, prefix + "Frameworks"
+      ln_s lib, frameworks
     end
 
     # The pkg-config files installed suggest that headers can be found in the
diff --git a/Library/Formula/unar.rb b/Library/Formula/unar.rb
index d7ca257e9..e59b0e416 100644
--- a/Library/Formula/unar.rb
+++ b/Library/Formula/unar.rb
@@ -22,8 +22,8 @@ class Unar < Formula
     bin.install "./Release/unar", "./Release/lsar"
 
     lib.install "./Release/libXADMaster.a"
-    (prefix/'Frameworks').install "./Release/XADMaster.framework"
-    (include/'libXADMaster').install_symlink Dir["#{prefix}/Frameworks/XADMaster.framework/Headers/*"]
+    frameworks.install "./Release/XADMaster.framework"
+    (include/'libXADMaster').install_symlink Dir["#{frameworks}/XADMaster.framework/Headers/*"]
 
     cd "./Extra" do
       man1.install "lsar.1", "unar.1"
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 88d4c9af9..e65948870 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -165,6 +165,7 @@ class Formula
   def sbin;    prefix+'sbin'    end
   def share;   prefix+'share'   end
 
+  def frameworks; prefix+'Frameworks' end
   def kext_prefix; prefix+'Library/Extensions' end
 
   # configuration needs to be preserved past upgrades