From 97c349b790e4c42b151177af928d59208f7b63b9 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Thu, 25 Dec 2008 13:25:24 +0100 Subject: [PATCH] Makefile: changes specific to msysgit release This commit prepares the Makefile for an msysgit release. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2c4a3f0285..543b0f4994 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,7 @@ STRIP ?= strip # runtime figures out where they are based on the path to the executable. # This can help installing the suite in a relocatable way. -prefix = $(HOME) +prefix = bindir_relative = bin bindir = $(prefix)/$(bindir_relative) mandir = share/man @@ -772,7 +772,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_MMAP = YesPlease NO_PREAD = YesPlease NO_OPENSSL = YesPlease - NO_CURL = YesPlease NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease NO_SETENV = YesPlease @@ -789,6 +788,8 @@ 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 @@ -798,6 +799,8 @@ 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 + NOEXECTEMPL = .noexec + htmldir=doc/git/html/ endif ifneq (,$(findstring arm,$(uname_M))) ARM_SHA1 = YesPlease -- 2.11.4.GIT