Merge branch 'ph/parseopt'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index e0c03c3eecc26d995f8829429092e887df17489f..dd31e339fb8d28baaaba78ea09518de0171d35a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -648,8 +648,8 @@ 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
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease