summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-05 01:09:08 -0500
committerJunio C Hamano <gitster@pobox.com>2009-02-05 00:33:40 -0800
commit7233d221ada5d32acabda0bed2d03486b76204fb (patch)
tree6f64ce20517abc374e551907134b07046c69b5db /Makefile
parent98bb1ff83c0287e855c7608db1d57fe71d2d6e1b (diff)
downloadgit-7233d221ada5d32acabda0bed2d03486b76204fb.tar.gz
Makefile: minor improvements for Mac OS X (Darwin)
1) Instead of requesting OLD_ICONV on all Mac OS X versions except for 10.5 (which will break when 10.6 is released), exlicitly request it for versions older than 10.5. 2) NO_STRLCPY is not needed since Mac OS X 10.2. Noticed by Benjamin Kramer. Note that uname -r returns the underlying Darwin version, which can be mapped to Mac OS X version at http://www.opensource.apple.com/darwinsource/ Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 605b147e72..627d4d09ba 100644
--- a/Makefile
+++ b/Makefile
@@ -649,10 +649,12 @@ endif
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
- ifneq ($(shell expr "$(uname_R)" : '9\.'),2)
+ ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
OLD_ICONV = UnfortunatelyYes
endif
- NO_STRLCPY = YesPlease
+ ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
+ NO_STRLCPY = YesPlease
+ endif
NO_MEMMEM = YesPlease
THREADED_DELTA_SEARCH = YesPlease
endif