From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:51:16 +0000 (-0800)
Subject: Merge branch 'rj/maint-simplify-cygwin-makefile' into maint
X-Git-Tag: v1.6.5.5~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c206224b2b7a32924c40b162c59329da143aba1f?hp=dc733ef4190dffcbcd5c1c27569fecf01f9a44bd

Merge branch 'rj/maint-simplify-cygwin-makefile' into maint

* rj/maint-simplify-cygwin-makefile:
Makefile: merge two Cygwin configuration sections into one
---

diff --git a/Makefile b/Makefile
index 856ba098b8..ed517b1a29 100644
--- a/Makefile
+++ b/Makefile
@@ -787,6 +787,8 @@ ifeq ($(uname_O),Cygwin)
 	NO_MMAP = YesPlease
 	NO_IPV6 = YesPlease
 	X = .exe
+	COMPAT_OBJS += compat/cygwin.o
+	UNRELIABLE_FSTAT = UnfortunatelyYes
 endif
 ifeq ($(uname_S),FreeBSD)
 	NEEDS_LIBICONV = YesPlease
@@ -896,10 +898,6 @@ ifeq ($(uname_S),HP-UX)
 	NO_SYS_SELECT_H = YesPlease
 	SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
-ifneq (,$(findstring CYGWIN,$(uname_S)))
-	COMPAT_OBJS += compat/cygwin.o
-	UNRELIABLE_FSTAT = UnfortunatelyYes
-endif
 ifdef MSVC
 	GIT_VERSION := $(GIT_VERSION).MSVC
 	pathsep = ;