summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorgabor <gabor@FreeBSD.org>2010-08-23 10:04:26 +0000
committergabor <gabor@FreeBSD.org>2010-08-23 10:04:26 +0000
commit415098b7a0b80ee2df0537585e6978bff2e8d28e (patch)
tree4fbc5e653ad93e90ffacc6f6ec3703b522bb962a /gnu
parent50d4a3193c693a85220d6d5595132133a5260003 (diff)
downloadFreeBSD-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 'gnu')
-rw-r--r--gnu/usr.bin/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 0a6d51f..2d9ad72 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -28,6 +28,10 @@ _groff= groff
.endif
.endif
+.if ${MK_BSD_GREP} != "yes"
+_grep= grep
+.endif
+
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
@@ -36,10 +40,6 @@ _cvs= cvs
_dtc= dtc
.endif
-.if ${MK_GNU_GREP} != "no"
-_grep= grep
-.endif
-
.if ${MK_INFO} != "no"
_texinfo= texinfo
.endif
OpenPOWER on IntegriCloud