summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>1999-02-12 12:45:05 +0000
committertv <tv@NetBSD.org>1999-02-12 12:45:05 +0000
commit93ef69af304a53570b5a794fb8bf837dfe2d5d66 (patch)
tree3e7f7c084f09373a18166c81130ace11519d1828 /gnu/usr.bin/diff3
parent26bcfd17ad8c95d0cbad2b8f77997fddce02d8bb (diff)
Use dist layout for diffutils, and add Texinfo doc.
Diffstat (limited to 'gnu/usr.bin/diff3')
-rw-r--r--gnu/usr.bin/diff3/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index cfac721af69..4b9dd6797f7 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.9 1997/10/25 10:10:32 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/12 12:45:13 tv Exp $
PROG= diff3
SRCS= diff3.c getopt.c getopt1.c version.c
-CPPFLAGS+= -I$(.CURDIR)/../diff \
+CPPFLAGS+= -I${.CURDIR}/../diff -I${DIST}/diffutils \
-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
LDADD+= -lgnumalloc
DPADD+= ${LIBGNUMALLOC}
+DIST= ${.CURDIR}/../../dist
+.PATH: ${.CURDIR}/../diff ${DIST}/diffutils
+
.include <bsd.prog.mk>
-.PATH: $(.CURDIR)/../diff