Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint-1.6.0' into maint
[gitweb.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 4a1e5bcc4def58a5d8f05a368fea69cde8ddb74e..fd7f51e8b95060dc2ee7fcf30382ba4c86cad4ef 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-828,6
+828,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