From ead812d72acde9d7e5de7fcb1758045163ba2208 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 13 Feb 2015 12:35:10 +0000 Subject: [PATCH] Start supporting MSys2 in config.mak.uname Signed-off-by: Johannes Schindelin --- config.mak.uname | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 74f7f1a41f..a6e9b45eba 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -534,9 +534,23 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = YesPlease - USE_LIBPCRE= YesPlease else - NO_CURL = YesPlease + ifeq ($(shell expr "$(uname_R)" : '2\.'),2) + # MSys2 + CC = gcc + htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html + prefix = /mingw32/ + INSTALL = /bin/install + NO_R_TO_GCC_LINKER = YesPlease + INTERNAL_QSORT = YesPlease + HAVE_LIBCHARSET_H = YesPlease + NO_GETTEXT = YesPlease + USE_LIBPCRE= YesPlease + NO_CURL = + USE_NED_ALLOCATOR = + else + NO_CURL = YesPlease + endif endif endif ifeq ($(uname_S),QNX)