From c796bd8a7f3d7ac957ae8a5f1f71a66b02cae5e9 Mon Sep 17 00:00:00 2001
From: Bill Joy <wnj@ucbvax.Berkeley.EDU>
Date: Fri, 23 Nov 1979 03:30:57 -0800
Subject: [PATCH] BSD 3 development Work on file usr/src/cmd/diff3/Makefile
 Work on file usr/src/cmd/diff3/diff3.sh

Synthesized-from: 3bsd
---
 usr/src/cmd/diff3/Makefile | 11 +++++++++++
 usr/src/cmd/diff3/diff3.sh | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 usr/src/cmd/diff3/Makefile
 create mode 100755 usr/src/cmd/diff3/diff3.sh

diff --git a/usr/src/cmd/diff3/Makefile b/usr/src/cmd/diff3/Makefile
new file mode 100644
index 0000000000..d9606e1f49
--- /dev/null
+++ b/usr/src/cmd/diff3/Makefile
@@ -0,0 +1,11 @@
+CFLAGS=-O -d2
+
+diff3: diff3.o
+	cc -o diff3 diff3.o
+
+install: diff3
+	install -s diff3 $(DESTDIR)/usr/lib
+	install -c diff3.sh $(DESTDIR)/usr/bin/diff3
+
+clean:
+	rm -f diff3.o diff3	
diff --git a/usr/src/cmd/diff3/diff3.sh b/usr/src/cmd/diff3/diff3.sh
new file mode 100755
index 0000000000..d56219fdc3
--- /dev/null
+++ b/usr/src/cmd/diff3/diff3.sh
@@ -0,0 +1,17 @@
+e=
+case $1 in
+-*)
+	e=$1
+	shift;;
+esac
+if test $# = 3 -a -f $1 -a -f $2 -a -f $3
+then
+	:
+else
+	echo usage: diff3 file1 file2 file3 1>&2
+	exit
+fi
+trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15
+diff $1 $3 >/tmp/d3a$$
+diff $2 $3 >/tmp/d3b$$
+/usr/lib/diff3 $e /tmp/d3[ab]$$ $1 $2 $3
-- 
2.20.1