upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-12 15:24:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
opnsense-src/gnu/usr.bin/diff3/Makefile

28 lines
643 B
Makefile
Raw Normal View History

$Id$ -> $FreeBSD$
1999-08-27 19:37:10 -04:00
# $FreeBSD$
Switch to contrib version
1997-10-29 11:50:42 -05:00
Convert gnu to using SRCTOP Prefer SRCTOP over CURDIR/../../contrib, etc. However, retain the "up one level" instances of ../ because they are really relative to this part of the tree and not a means to find the root of the tree. As such, it's better to leave them since that further the goal of being able to move directories if watned to in the future. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice)
2017-03-12 14:59:16 -04:00
DIFFSRC=${SRCTOP}/contrib/diff/src
Update build skeleton after diffutils 2.8.7 update.
2007-06-15 03:09:34 -04:00
.PATH: ${DIFFSRC} \
Convert gnu to using SRCTOP Prefer SRCTOP over CURDIR/../../contrib, etc. However, retain the "up one level" instances of ../ because they are really relative to this part of the tree and not a means to find the root of the tree. As such, it's better to leave them since that further the goal of being able to move directories if watned to in the future. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice)
2017-03-12 14:59:16 -04:00
${SRCTOP}/contrib/diff/lib \
${SRCTOP}/contrib/diff/man
Switch to contrib version
1997-10-29 11:50:42 -05:00
Update diff, diff3, and sdiff's makefiles to use .PATH: instead of copying the same files to multiple directories. This should make things easier when it comes time to update to a newer version of diffutils. With this checkin, this brings the netbsd and freebsd diff dists into sync.
1993-07-09 16:36:06 -04:00
PROG= diff3
Update build skeleton after diffutils 2.8.7 update.
2007-06-15 03:09:34 -04:00
SRCS= diff3.c version-etc.c \
xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
Switch to contrib version
1997-10-29 11:50:42 -05:00
# Important for ctype macros!
CFLAGS+=-funsigned-char
Convert gnu to using SRCTOP Prefer SRCTOP over CURDIR/../../contrib, etc. However, retain the "up one level" instances of ../ because they are really relative to this part of the tree and not a means to find the root of the tree. As such, it's better to leave them since that further the goal of being able to move directories if watned to in the future. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice)
2017-03-12 14:59:16 -04:00
CFLAGS+=-I${SRCTOP}/contrib/diff/
CFLAGS+=-I${SRCTOP}/contrib/diff/src
CFLAGS+=-I${SRCTOP}/contrib/diff/lib
Switch to contrib version
1997-10-29 11:50:42 -05:00
CFLAGS+=-DHAVE_CONFIG_H
Update build skeleton after diffutils 2.8.7 update.
2007-06-15 03:09:34 -04:00
CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
.for f in diff3.c
${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
POSIX patch(1) would treat -b as different meaning (the functionality is to be provided by --suffix). Looking at the usage here in diffutils, it seems that we can just get rid of the -b .orig stuff. This resolves a problem that can triggered if we move toward to a more permissively licensed patch(1) program.
2010-02-22 17:32:24 -05:00
patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
Update build skeleton after diffutils 2.8.7 update.
2007-06-15 03:09:34 -04:00
CLEANFILES+= ${f}
.endfor
GNU3 Diff 2.3
1993-06-29 04:19:28 -04:00
.include <bsd.prog.mk>
Reference in a new issue Copy permalink