From e4b6c3604eed17ec5e50ee4f8758d7c157656e8d Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 29 Oct 1997 16:50:42 +0000
Subject: [PATCH] Switch to contrib version

---
 gnu/usr.bin/diff3/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 3d2b422b87fc..b98c2877a5dc 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,8 +1,15 @@
+# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
+
+.PATH:  ${.CURDIR}/../../../contrib/diff
+
 PROG=		diff3
 SRCS=		diff3.c getopt.c getopt1.c version.c
-CFLAGS+=	-I$(.CURDIR)/../diff  -DHAVE_CONFIG_H \
-		-DDIFF_PROGRAM=\"/usr/bin/diff\"
-MAN=		diff3.1
+
+# Important for ctype macros!
+CFLAGS+=-funsigned-char
+
+CFLAGS+=-I${.CURDIR}/../../../contrib/diff
+CFLAGS+=-DHAVE_CONFIG_H
+CFLAGS+=-DDIFF_PROGRAM=\"/usr/bin/diff\"
 
 .include <bsd.prog.mk>
-.PATH: $(.CURDIR)/../diff