Deleted Added
full compact
Makefile (170758) Makefile (204227)
1# $FreeBSD: head/gnu/usr.bin/diff3/Makefile 170758 2007-06-15 07:09:34Z delphij $
1# $FreeBSD: head/gnu/usr.bin/diff3/Makefile 204227 2010-02-22 22:32:24Z delphij $
2
3DIFFSRC=${.CURDIR}/../../../contrib/diff/src
4.PATH: ${DIFFSRC} \
5 ${.CURDIR}/../../../contrib/diff/lib \
6 ${.CURDIR}/../../../contrib/diff/man
7
8PROG= diff3
9SRCS= diff3.c version-etc.c \

--- 5 unchanged lines hidden (view full) ---

15CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
16CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
17CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
18CFLAGS+=-DHAVE_CONFIG_H
19CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
20
21.for f in diff3.c
22${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
2
3DIFFSRC=${.CURDIR}/../../../contrib/diff/src
4.PATH: ${DIFFSRC} \
5 ${.CURDIR}/../../../contrib/diff/lib \
6 ${.CURDIR}/../../../contrib/diff/man
7
8PROG= diff3
9SRCS= diff3.c version-etc.c \

--- 5 unchanged lines hidden (view full) ---

15CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
16CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
17CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
18CFLAGS+=-DHAVE_CONFIG_H
19CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
20
21.for f in diff3.c
22${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
23 patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
23 patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
24CLEANFILES+= ${f}
25.endfor
26
27.include <bsd.prog.mk>
24CLEANFILES+= ${f}
25.endfor
26
27.include <bsd.prog.mk>