git: style cleanups

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index eccd78fdd..a65f96595 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -11,9 +11,9 @@ class GitHtmldocs < Formula
 end
 
 class Git < Formula
+  homepage 'http://git-scm.com'
   url 'http://git-core.googlecode.com/files/git-1.7.9.tar.gz'
   sha1 'ed51ef5ef250daaa6e98515cf2641820cd268d4c'
-  homepage 'http://git-scm.com'
 
   depends_on 'pcre' if ARGV.include? '--with-pcre'
 
@@ -26,29 +26,29 @@ class Git < Formula
 
   def install
     # If these things are installed, tell Git build system to not use them
-    ENV['NO_FINK']='1'
-    ENV['NO_DARWIN_PORTS']='1'
-    ENV['V']='1' # build verbosely
-    ENV['NO_R_TO_GCC_LINKER']='1' # pass arguments to LD correctly
-    ENV['NO_GETTEXT']= '1'
+    ENV['NO_FINK'] = '1'
+    ENV['NO_DARWIN_PORTS'] = '1'
+    ENV['V'] = '1' # build verbosely
+    ENV['NO_R_TO_GCC_LINKER'] = '1' # pass arguments to LD correctly
+    ENV['NO_GETTEXT'] = '1'
     # workaround for users of perlbrew
     ENV['PERL_PATH'] = `/usr/bin/which perl`.chomp
 
     # Clean XCode 4.x installs don't include Perl MakeMaker
     ENV['NO_PERL_MAKEMAKER']='1' if MacOS.lion?
 
-    ENV['BLK_SHA1']='1' if ARGV.include? '--with-blk-sha1'
+    ENV['BLK_SHA1'] = '1' if ARGV.include? '--with-blk-sha1'
 
     if ARGV.include? '--with-pcre'
-      ENV['USE_LIBPCRE']='1'
+      ENV['USE_LIBPCRE'] = '1'
       ENV['LIBPCREDIR'] = HOMEBREW_PREFIX
     end
 
-    inreplace "Makefile" do |s|
-      s.remove_make_var! %w{CC CFLAGS LDFLAGS}
-    end
-
-    system "make", "prefix=#{prefix}", "install"
+    system "make", "prefix=#{prefix}",
+                   "CC=#{ENV.cc}",
+                   "CFLAGS=#{ENV.cflags}",
+                   "LDFLAGS=#{ENV.ldflags}",
+                   "install"
 
     # Install the Git bash completion file.
     # Put it into the Cellar so that it gets upgraded along with git upgrades.
@@ -72,7 +72,7 @@ class Git < Formula
     Emacs support has been installed to:
       #{HOMEBREW_PREFIX}/share/doc/git-core/contrib/emacs
 
-    The rest of the "contrib" is installed to:
+    The rest of "contrib" is installed to:
       #{HOMEBREW_PREFIX}/share/git/contrib
     EOS
   end