aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1993-11-12 07:05:54 +0000
committerNate Williams <nate@FreeBSD.org>1993-11-12 07:05:54 +0000
commitc7ed70b75dcb9d5603c7a7efacc974d0e29d9a6f (patch)
treeccdf94118f89667bc5481656e35a277126890ddc /gnu/usr.bin/diff3
parent2839c0afd947ea73005c48e263152695efb2a586 (diff)
downloadsrc-c7ed70b75dcb9d5603c7a7efacc974d0e29d9a6f.tar.gz
src-c7ed70b75dcb9d5603c7a7efacc974d0e29d9a6f.zip
Updated to GNU diffutils 2.6
Notes
Notes: svn path=/head/; revision=753
Diffstat (limited to 'gnu/usr.bin/diff3')
-rw-r--r--gnu/usr.bin/diff3/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 5522f5e51bc3..3d2b422b87fc 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,10 +1,7 @@
PROG= diff3
SRCS= diff3.c getopt.c getopt1.c version.c
-CFLAGS+= -I$(.CURDIR)/../diff\
- -DDIRENT=1 -DHAVE_UNISTD_H=1 -DHAVE_DUP2=1 -DHAVE_MEMCHR=1\
- -DHAVE_STRERROR=1 -DHAVE_WAITPID=1 -DHAVE_FCNTL_H=1\
- -DHAVE_STRING_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_TIME_H=1\
- -DHAVE_ST_BLKSIZE=1 -DDIFF_PROGRAM=\"/usr/bin/diff\"
+CFLAGS+= -I$(.CURDIR)/../diff -DHAVE_CONFIG_H \
+ -DDIFF_PROGRAM=\"/usr/bin/diff\"
MAN= diff3.1
.include <bsd.prog.mk>