From d0f138ad09d84f552ca061d601140359b9e3533f Mon Sep 17 00:00:00 2001
From: Tim Harper <timcharper@gmail.com>
Date: Sun, 29 Jun 2014 14:29:45 -0600
Subject: [PATCH] v2.0.1

---
 build.sh                         | 9 +++++----
 build_package_test_and_bundle.sh | 1 +
 git-manpages                     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 82147f0..d74bffe 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 . env.sh
 
@@ -15,8 +15,9 @@ $SUDO mv $PREFIX{,_`date +%s`} || echo "Git not installed currently"
 
 mkdir -p git_build
 
-export CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
-export LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
+export TARGET_FLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -DMACOSX_DEPLOYMENT_TARGET=10.6"
+export CFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"
+export LDFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"
 
 export C_INCLUDE_PATH=/usr/include
 export CPLUS_INCLUDE_PATH=/usr/include
@@ -41,7 +42,7 @@ pushd git_build
 
         # git-credential-osxkeychain
         pushd contrib/credential/osxkeychain
-            CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" make
+            CFLAGS="$TARGET_FLAGS -arch x86_64" LDFLAGS="$TARGET_FLAGS -arch x86_64" make
             $SUDO cp git-credential-osxkeychain $PREFIX/bin/git-credential-osxkeychain
         popd
     popd
diff --git a/build_package_test_and_bundle.sh b/build_package_test_and_bundle.sh
index 07b3900..b0d7e6a 100755
--- a/build_package_test_and_bundle.sh
+++ b/build_package_test_and_bundle.sh
@@ -10,6 +10,7 @@ rm -f Disk\ Image/*.pkg
 if [ "`uname`" == "Darwin" ]; then sed_regexp="-E"; else sed_regexp="-r"; fi
 GIT_VERSION="${1:-`curl http://git-scm.com/ 2>&1 | grep '<span class="version">' -A 1 | tail -n 1 | sed $sed_regexp 's/ *//'`}"
 
+echo $GIT_VERSION
 ./build.sh $GIT_VERSION
 
 PACKAGE_NAME="git-$GIT_VERSION-intel-universal-snow-leopard"
diff --git a/git-manpages b/git-manpages
index 8e0f4d7..67adeb7 160000
--- a/git-manpages
+++ b/git-manpages
@@ -1 +1 @@
-Subproject commit 8e0f4d724ce6db7c11f2cb189bb73f0d6bf29c07
+Subproject commit 67adeb752b2c55318814e9c1230612eb8ddcd7f7