summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
commit98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch)
tree55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /gnu/usr.bin/diff
parentb17ff922d4072ae132ece458f5b5d74a236880ac (diff)
parente81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff)
Notes
Diffstat (limited to 'gnu/usr.bin/diff')
-rw-r--r--gnu/usr.bin/diff/Makefile8
-rw-r--r--gnu/usr.bin/diff/doc/Makefile9
2 files changed, 4 insertions, 13 deletions
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 6b29df5c0e98..f5b38f1db9a8 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -5,7 +5,8 @@
DIFFSRC=${.CURDIR}/../../../contrib/diff/src
.PATH: ${DIFFSRC} \
${.CURDIR}/../../../contrib/diff/lib \
- ${.CURDIR}/../../../contrib/diff/man
+ ${.CURDIR}/../../../contrib/diff/man \
+ ${.CURDIR}/../../../contrib/diff/doc
PROG= diff
SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
@@ -24,10 +25,9 @@ CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
CFLAGS+=-I${DESTDIR}/usr/include/gnu
-SUBDIR+=doc
+MAN= diff.1 diff.7
-DPADD= ${LIBGNUREGEX}
-LDADD= -lgnuregex
+LIBADD+= gnuregex
.if ${MK_TESTS} != "no"
SUBDIR+= tests
diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
deleted file mode 100644
index a8a874a6d6d3..000000000000
--- a/gnu/usr.bin/diff/doc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-INFO = diff
-
-INFOENTRY_diff= "* DIFF: (diff). DIFF/PATCH Reference Manual."
-
-SRCDIR=${.CURDIR}/../../../../contrib/diff/doc
-
-.include <bsd.info.mk>