aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-03 07:41:25 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-03 07:41:25 -0700
commit3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a (patch)
treefe6a29d3d62f85eea9953deaf5653741fe73e54c /Makefile
parentd627f68fbbe0480337cd56cce442ed8c1efa230e (diff)
parent0d1d154dbe4d16a802c2e357de96e349f04d2f2c (diff)
downloadgit-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.tar.xz
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud: gitweb: Support for simple project search form gitweb: Make the by_tag filter delve in forks as well gitweb: Support for tag clouds ... (+ many updates from master) ... Conflicts: gitweb/gitweb.perl
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e0c03c3eec..15ca6599a7 100644
--- a/Makefile
+++ b/Makefile
@@ -648,6 +648,7 @@ ifeq ($(uname_S),SunOS)
NO_MEMMEM = YesPlease
NO_HSTRERROR = YesPlease
NO_MKDTEMP = YesPlease
+ OLD_ICONV = UnfortunatelyYes
ifeq ($(uname_R),5.8)
NEEDS_LIBICONV = YesPlease
NO_UNSETENV = YesPlease