diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-10-11 14:34:06 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-10-11 14:34:06 +0000 |
| commit | 00d78afd17deaa2a40b02c4273decdc51e896d42 (patch) | |
| tree | 1b7322ec423ecf6eaaba137658830ba781db4b43 /tools | |
| parent | 70e3b262d1128f0e62d736cfaa7a70cc5080f6aa (diff) | |
| download | src-00d78afd17deaa2a40b02c4273decdc51e896d42.tar.gz src-00d78afd17deaa2a40b02c4273decdc51e896d42.zip | |
OptionalObsoleteFiles: remove diff from MK_GNU_DIFF=no block
diff (and man page) are not from GNU, as of r317209, and should not be
deleted if WITHOUT_GNU_DIFF is set. (WITHOUT_GNU_DIFF still controls
whether diff3 is built.)
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=324531
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c1b46f435063..e8c4bedebc06 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2480,9 +2480,7 @@ OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif .if ${MK_GNU_DIFF} == no -OLD_FILES+=usr/bin/diff OLD_FILES+=usr/bin/diff3 -OLD_FILES+=usr/share/man/man1/diff.1.gz OLD_FILES+=usr/share/man/man1/diff3.1.gz OLD_FILES+=usr/share/man/man7/diff.7.gz .endif |