builtin-merge.c: allocate correct amount of memory

diff --git a/Makefile b/Makefile
index 8d81095765b1e73fa79e2950c47fd06f3c475ac7..7fad9f7ff6df54435659ec96f9611008b21fe27f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -637,6 +637,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