summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-13 00:20:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-13 00:25:29 (GMT)
commit1293c95241531f7f17ddb58739c5c42da46fa78c (patch)
tree938d9ba01f079d6e1294e3ae4abda8efb7dd90d7 /Makefile
parentede4caf6e3204f9d63758d6410d0f124b0caab32 (diff)
parent97a7a82f199f165f85fe39a3c318b18c621e6335 (diff)
downloadgit-1293c95241531f7f17ddb58739c5c42da46fa78c.zip
git-1293c95241531f7f17ddb58739c5c42da46fa78c.tar.gz
git-1293c95241531f7f17ddb58739c5c42da46fa78c.tar.bz2
Sync with 1.6.0.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 247cd2d..3c0664a 100644
--- a/Makefile
+++ b/Makefile
@@ -688,6 +688,8 @@ ifeq ($(uname_S),FreeBSD)
BASIC_LDFLAGS += -L/usr/local/lib
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
THREADED_DELTA_SEARCH = YesPlease
+ COMPAT_CFLAGS += -Icompat/regex
+ COMPAT_OBJS += compat/regex/regex.o
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
@@ -714,6 +716,8 @@ ifeq ($(uname_S),AIX)
INTERNAL_QSORT = UnfortunatelyYes
NEEDS_LIBICONV=YesPlease
BASIC_CFLAGS += -D_LARGE_FILES
+ COMPAT_CFLAGS += -Icompat/regex
+ COMPAT_OBJS += compat/regex/regex.o
endif
ifeq ($(uname_S),GNU)
# GNU/Hurd