Merge branch 'master'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 6f9b0d1..56e0fb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,9 @@
 # Define USE_STDEV below if you want git to care about the underlying device
 # change being considered an inode change from the update-cache perspective.
 
-GIT_VERSION = 0.99.9.GIT
+GIT_VERSION = 0.99.9e
 
 # CFLAGS is for the users to override from the command line.
-
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS)
 
@@ -185,6 +184,10 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
 ifeq ($(uname_S),Darwin)
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
+       ## fink
+       ALL_CFLAGS += -I/sw/include -L/sw/lib
+       ## darwinports
+       ALL_CFLAGS += -I/opt/local/include -L/opt/local/lib
 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease