global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-02 13:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

MinGW: Teach Makefile to detect msysgit

Browse Source 
This commit changes handling of the msysgit specific settings, so
that they can be applied to Junio's git.git.  Some msysgit
settings differ from the standard MinGW settings.  We move them
into a ifndef block that is only evaluated if a file
THIS_IS_MSYSGIT is present in the parent directory, which will be
the case for an msysgit working environment, and we assume that
such a file is not present accidentally.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
This commit is contained in:
Steffen Prohaska
2009-05-23 10:49:17 +02:00
parent ac3f43986a
commit 5fb08d69b1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -817,9 +817,6 @@ ifneq (,$(findstring CYGWIN,$(uname_S)))
endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
NO_PREAD = YesPlease
NO_OPENSSL = YesPlease
NO_SYMLINK_HEAD = YesPlease
@@ -838,8 +835,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
SNPRINTF_RETURNS_BOGUS = YesPlease
NO_SVN_TESTS = YesPlease
NO_PERL_MAKEMAKER = YesPlease
NO_R_TO_GCC_LINKER = YesPlease
INTERNAL_QSORT = YesPlease
RUNTIME_PREFIX = YesPlease
NO_POSIX_ONLY_PROGRAMS = YesPlease
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@ -853,7 +848,16 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
EXTLIBS += -lws2_32
X = .exe
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
htmldir=doc/git/html/
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
NO_R_TO_GCC_LINKER = YesPlease
INTERNAL_QSORT = YesPlease
else
NO_CURL = YesPlease
endif
endif
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease