summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-03 01:16:22 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-03 01:16:22 (GMT)
commitbf8f2ad5f20b8c911d6a84438faa3c994decf71b (patch)
tree4e3e9d4bd39e1941a1c5905c479dd0ef79e4638e /Makefile
parent9126f0091f271f090cc030a788219574ab0fea97 (diff)
parent9a1fd653b13b6cc136bfa5b9563f629b2af1a6c8 (diff)
downloadgit-bf8f2ad5f20b8c911d6a84438faa3c994decf71b.zip
git-bf8f2ad5f20b8c911d6a84438faa3c994decf71b.tar.gz
git-bf8f2ad5f20b8c911d6a84438faa3c994decf71b.tar.bz2
Merge branch 'maint'
* maint: gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh gitweb: Fix two 'uninitialized value' warnings in git_tree() Solaris: Use OLD_ICONV to avoid compile warnings gitweb: remove PATH_INFO from $my_url and $my_uri
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e0c03c3..15ca659 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