summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-26 14:33:05 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-26 14:33:05 -0800
commit1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43 (patch)
treeef21341598075406f1488c9a023f40798d1236f8 /Makefile
parent68b890a8d5aab897f392928105596de85cc9135e (diff)
parent21a0d9b42d9cc9560c66fb3cfa82a2a449de8b39 (diff)
downloadgit-1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43.tar.gz
Merge branch 'maint'
* maint: Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV Start 1.6.6.X maintenance track Add git-http-backend to command-list. t4019 "grep" portability fix t1200: work around a bug in some implementations of "find" Conflicts: RelNotes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index fd4919c0ad..c11719c277 100644
--- a/Makefile
+++ b/Makefile
@@ -836,6 +836,7 @@ ifeq ($(uname_O),Cygwin)
endif
ifeq ($(uname_S),FreeBSD)
NEEDS_LIBICONV = YesPlease
+ OLD_ICONV = YesPlease
NO_MEMMEM = YesPlease
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib