Andrew's git / gitweb.git / diff
?
Makefile: future-proof Cygwin version check
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 3 Apr 2010 07:47:00 +0000 (02:47 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 18:26:35 +0000 (11:26 -0700)
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>
Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 11ec3e25009dfbf62212ffe39d06bbfa3e3dcf94..140d19e7d09102043e45b839c5c56eb60219a03b 100644 (file)
--- 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