Merge branch 'jc/diff' into next

diff --git a/Makefile b/Makefile
index 506f6407935b20ba5efbd1f09390bfb2cd3c2d58..55d193780fd49768ed8a8490059a82387ba3b4ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -287,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