diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:33:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:33:05 -0800 |
| commit | 1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43 (patch) | |
| tree | ef21341598075406f1488c9a023f40798d1236f8 /Makefile | |
| parent | Kick off 1.7.0 cycle (diff) | |
| parent | Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV (diff) | |
| download | tgif-1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43.tar.xz | |
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-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |