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.

This commit is contained in:

Xin LI

2010-02-22 22:32:24 +00:00

parent 7bd35300da

commit aa74e2f883

3 changed files with 3 additions and 3 deletions

									
										gnu/usr.bin/diff3/Makefile
									
		+1
		-1
	
												View File
												
				@@ -20,7 +20,7 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"

				.for f in diff3.c

				${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff

					patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}

					patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}

				CLEANFILES+= ${f}

				.endfor