MinGW: Teach Makefile to detect msysgit and apply specific settings
This commit changes handling of the msysgit specific settings, so that they can be applied to official git.git. Some msysgit settings differ from the standard MinGW settings. We move them into an ifndef block that is only evaluated if a file THIS_IS_MSYSGIT is present in the parent directory, which is the case for an msysgit working environment. The tag file is unlikely to be present accidentally. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Steffen Prohaska committed
May 31, 2009 at 18:15 UTC
48c46f1a14b45756b7354bdf2a52be8d93ebfaf3
1 file changed
+12
-2
Makefile
+12
-2
@@ -825,7 +825,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
825
pathsep = ;
826
NO_PREAD = YesPlease
827
NO_OPENSSL = YesPlease
828
- NO_CURL = YesPlease
828
NO_SYMLINK_HEAD = YesPlease
829
NO_IPV6 = YesPlease
830
NO_SETENV = YesPlease
@@ -833,7 +832,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
832
NO_STRCASESTR = YesPlease
833
NO_STRLCPY = YesPlease
834
NO_MEMMEM = YesPlease
836
- NO_PTHREADS = YesPlease
835
NEEDS_LIBICONV = YesPlease
836
OLD_ICONV = YesPlease
837
NO_C99_FORMAT = YesPlease
@@ -855,6 +853,18 @@ ifneq (,$(findstring MINGW,$(uname_S)))
853
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
854
EXTLIBS += -lws2_32
855
X = .exe
856
+ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
857
+ htmldir=doc/git/html/
858
+ prefix =
859
+ INSTALL = /bin/install
860
+ EXTLIBS += /mingw/lib/libz.a
861
+ NO_R_TO_GCC_LINKER = YesPlease
862
+ INTERNAL_QSORT = YesPlease
863
+ THREADED_DELTA_SEARCH = YesPlease
864
+else
865
+ NO_CURL = YesPlease
866
+ NO_PTHREADS = YesPlease
867
+endif
868
endif
869
ifneq (,$(findstring arm,$(uname_M)))
870
ARM_SHA1 = YesPlease