Merge branch 'master' of https://github.com/mxcl/homebrew

turadg · Feb 26, 2012 · e9dfb71 · e9dfb71
2 parents cdca179 + a4926b8
commit e9dfb71
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/Library/Formula/atlassian-plugin-sdk.rb b/Library/Formula/atlassian-plugin-sdk.rb
@@ -9,10 +9,6 @@ def install
     # Remove windows files
     rm_f Dir["bin/*.bat"]
 
-    cd "apache-maven/maven-docs" do
-      prefix.install %w{ NOTICE.txt LICENSE.txt README.txt }
-    end
-
     # Install jars in libexec to avoid conflicts
     libexec.install Dir['*']
 

diff --git a/Library/Formula/enca.rb b/Library/Formula/enca.rb
@@ -8,7 +8,7 @@ class Enca < Formula
   depends_on 'libiconv'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
   end

diff --git a/Library/Formula/libiptcdata.rb b/Library/Formula/libiptcdata.rb
@@ -9,7 +9,7 @@ class Libiptcdata < Formula
   depends_on 'libiconv'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
   end

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
@@ -148,6 +148,14 @@ def effective_lib
     return lib
   end
 
+  # include folder,taking into account whether we are a Framework build or not
+  def effective_include
+    # If we're installed or installing as a Framework, then use that location.
+    return prefix+"Frameworks/Python.framework/Versions/2.7/include" if as_framework?
+    # Otherwise use just 'include'
+    return include
+  end
+
   # The Cellar location of site-packages
   def site_packages
     effective_lib+"python2.7/site-packages"

diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
@@ -154,6 +154,14 @@ def effective_lib
     return lib
   end
 
+  # include folder,taking into account whether we are a Framework build or not
+  def effective_include
+    # If we're installed or installing as a Framework, then use that location.
+    return prefix+"Frameworks/Python.framework/Versions/3.2/include" if as_framework?
+    # Otherwise use just 'include'
+    return include
+  end
+
   # The Cellar location of site-packages
   def site_packages
     effective_lib+"python3.2/site-packages"

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -586,13 +586,17 @@ def stage
   end
 
   def patch
-    return if patches.nil?
+    # Only call `patches` once.
+    # If there is code in `patches`, which is not recommended, we only
+    # want to run that code once.
+    the_patches = patches
+    return if the_patches.nil?
 
-    if not patches.kind_of? Hash
+    if not the_patches.kind_of? Hash
       # We assume -p1
-      patch_defns = { :p1 => patches }
+      patch_defns = { :p1 => the_patches }
     else
-      patch_defns = patches
+      patch_defns = the_patches
     end
 
     patch_list=[]