Merge branch 'maint-1.6.2' into maint-1.6.3

diff --git a/Makefile b/Makefile
index d21b4eb54f936fb4a142d9b4844636ddaac00e1d..f88ed3e14d2421fdd730705d2aac0c317d6f94e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -702,6 +702,7 @@ ifeq ($(uname_S),SunOS)
        NO_HSTRERROR = YesPlease
        NO_MKDTEMP = YesPlease
        OLD_ICONV = UnfortunatelyYes
+       NO_EXTERNAL_GREP = YesPlease
        ifeq ($(uname_R),5.8)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
@@ -1385,7 +1386,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
 
 $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
+$(patsubst git-%$X,%.o,$(PROGRAMS)) git.o: $(LIB_H) $(wildcard */*.h)
 builtin-revert.o wt-status.o: wt-status.h
 
 $(LIB_FILE): $(LIB_OBJS)