gdal: cleanup python usage.

1 files changed, 12 insertions, 26 deletions

diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index 6b5ef2c1b..a11d1e3e9 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -228,19 +228,17 @@ class Gdal < Formula
     system "make"
     system "make install"
 
-    python do
-      # `python-config` may try to talk us into building bindings for more
-      # architectures than we really should.
-      if MacOS.prefer_64_bit?
-        ENV.append_to_cflags "-arch #{Hardware::CPU.arch_64_bit}"
-      else
-        ENV.append_to_cflags "-arch #{Hardware::CPU.arch_32_bit}"
-      end
-
-      cd 'swig/python' do
-        system python, "setup.py", "install", "--prefix=#{prefix}", "--record=installed.txt", "--single-version-externally-managed"
-        bin.install Dir['scripts/*']
-      end
+    # `python-config` may try to talk us into building bindings for more
+    # architectures than we really should.
+    if MacOS.prefer_64_bit?
+      ENV.append_to_cflags "-arch #{Hardware::CPU.arch_64_bit}"
+    else
+      ENV.append_to_cflags "-arch #{Hardware::CPU.arch_32_bit}"
+    end
+
+    cd 'swig/python' do
+      system "python", "setup.py", "install", "--prefix=#{prefix}", "--record=installed.txt", "--single-version-externally-managed"
+      bin.install Dir['scripts/*']
     end
 
     system 'make', 'man' if build.head?
@@ -250,18 +248,8 @@ class Gdal < Formula
   end
 
   def caveats
-    msg = ""
-    if python
-      msg += python.standard_caveats +
-      <<-EOS.undent
-        This version of GDAL was built with Python support. In addition to providing
-        modules that makes GDAL functions available to Python scripts, the Python
-        binding provides additional command line tools.
-      EOS
-    end
-
     if build.include? 'enable-mdb'
-      msg += <<-EOS.undent
+      <<-EOS.undent
 
       To have a functional MDB driver, install supporting .jar files in:
         `/Library/Java/Extensions/`
@@ -269,8 +257,6 @@ class Gdal < Formula
       See: `http://www.gdal.org/ogr/drv_mdb.html`
       EOS
     end
-
-    msg
   end
 end