X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile;h=93779b06f1a12989a6920cbc2a09170d70e62730;hb=8701ea0f627dcba4bb75570f87df9c93985d397a;hp=93918a03779f1a093da17ed12a42a340100b55d2;hpb=15739c89fbf508c453da854ec50f313505bbe78f;p=git.git

diff --git a/Makefile b/Makefile
index 93918a037..93779b06f 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,8 @@ LIB_OBJS = \
 	$(DIFF_OBJS)
 
 BUILTIN_OBJS = \
-	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o
+	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
+	builtin-grep.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz
@@ -286,7 +287,9 @@ ifeq ($(uname_S),OpenBSD)
 	ALL_LDFLAGS += -L/usr/local/lib
 endif
 ifeq ($(uname_S),NetBSD)
-	NEEDS_LIBICONV = YesPlease
+	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
+		NEEDS_LIBICONV = YesPlease
+	endif
 	ALL_CFLAGS += -I/usr/pkg/include
 	ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
 endif