Add --no-commit to git-merge/git-pull.

diff --git a/Makefile b/Makefile
index 488ee365c92ffed07fa2c238049272eb50e7f88f..be6101ab23054c0af581f6d5cddb5c246304c7b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@ endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease
        NEEDS_NSL = YesPlease
+       NEEDS_LIBICONV = YesPlease
        SHELL_PATH = /bin/bash
        NO_STRCASESTR = YesPlease
-       CURLDIR = /opt/sfw
        INSTALL = ginstall
        TAR = gtar
        PLATFORM_DEFINES += -D__EXTENSIONS__