From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 3 Apr 2010 07:47:00 +0000 (-0500)
Subject: Makefile: future-proof Cygwin version check
X-Git-Tag: v1.7.1-rc0~27
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ecebd1e1a75883b3927c0bffe0cd27b933ed2c67;p=git.git

Makefile: future-proof Cygwin version check

Tweak the condition that detects old Cygwin versions to not include
versions such as 1.8, 1.11, and 2.1.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index 11ec3e250..140d19e7d 100644
--- a/Makefile
+++ b/Makefile
@@ -831,7 +831,7 @@ ifeq ($(uname_S),SunOS)
 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
 endif
 ifeq ($(uname_O),Cygwin)
-	ifneq ($(wordlist 1, 2, $(subst ., ,$(uname_R))),1 7)
+	ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4)
 		NO_D_TYPE_IN_DIRENT = YesPlease
 		NO_D_INO_IN_DIRENT = YesPlease
 		NO_STRCASESTR = YesPlease