diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2011-05-25 01:04:12 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2011-05-25 01:04:12 +0000 |
| commit | a23d1c70b3ec60cd41eb0e063e88f171c7f81084 (patch) | |
| tree | 2d062953dece4440112f7980c27ef3b097cb7e54 /usr.bin | |
| parent | 8d5a3ca77bc357a21ed5eed52084ac6eceeb6429 (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/grep/Makefile | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 85a9180f9d84..f258347ef7d8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -57,7 +57,7 @@ SUBDIR= alias \ getconf \ getent \ getopt \ - ${_grep} \ + grep \ gzip \ head \ hexdump \ @@ -227,10 +227,6 @@ SUBDIR+= bluetooth SUBDIR+= cpio .endif -.if ${MK_BSD_GREP} != "no" -_grep= grep -.endif - .if ${MK_CALENDAR} != "no" SUBDIR+= calendar .endif diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 98fceebf5c3c..8cd490d9b390 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -2,9 +2,16 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ +.include <bsd.own.mk> + +.if ${MK_BSD_GREP} == "yes" PROG= grep +.else +PROG= bsdgrep +.endif SRCS= fastgrep.c file.c grep.c queue.c util.c +.if ${MK_BSD_GREP} == "yes" LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ @@ -16,6 +23,10 @@ MLINKS= grep.1 egrep.1 \ grep.1 zgrep.1 \ grep.1 zegrep.1 \ grep.1 zfgrep.1 +.endif + +bsdgrep.1: grep.1 + cp ${.ALLSRC} ${.TARGET} WARNS?= 6 |