diff options
author | gabor <gabor@FreeBSD.org> | 2010-08-23 10:04:26 +0000 |
---|---|---|
committer | gabor <gabor@FreeBSD.org> | 2010-08-23 10:04:26 +0000 |
commit | 415098b7a0b80ee2df0537585e6978bff2e8d28e (patch) | |
tree | 4fbc5e653ad93e90ffacc6f6ec3703b522bb962a /usr.bin/Makefile | |
parent | 50d4a3193c693a85220d6d5595132133a5260003 (diff) | |
download | FreeBSD-src-415098b7a0b80ee2df0537585e6978bff2e8d28e.zip FreeBSD-src-415098b7a0b80ee2df0537585e6978bff2e8d28e.tar.gz |
- Change default grep back to GNU version. BSD grep can be built with the
WITH_BSD_GREP knob.
- Bump __FreeBSD_version
Requested by: dougb
Approved by: delphij (mentor)
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r-- | usr.bin/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 08c10c3..3214761 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -277,6 +277,10 @@ _bluetooth= bluetooth _cpio= cpio .endif +.if ${MK_BSD_GREP} != "no" +_grep= grep +.endif + .if ${MK_CALENDAR} != "no" _calendar= calendar .endif @@ -285,10 +289,6 @@ _calendar= calendar _clang= clang .endif -.if ${MK_GNU_GREP} != "yes" -_grep= grep -.endif - .if ${MK_HESIOD} != "no" _hesinfo= hesinfo .endif |