summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-05-26 17:38:00 +0000
committerattilio <attilio@FreeBSD.org>2011-05-26 17:38:00 +0000
commit867c6223e7e4f6682389d40926782fd537ffc3ad (patch)
tree87423ad4498424494102d7b58615c0df44019d32 /gnu
parentc0038ec50d088a2152d05e1da7d5b4cec45e8d27 (diff)
parentd7214daa609442aa65fdbb054db56a3ffc1ee75a (diff)
downloadFreeBSD-src-867c6223e7e4f6682389d40926782fd537ffc3ad.zip
FreeBSD-src-867c6223e7e4f6682389d40926782fd537ffc3ad.tar.gz
MFC
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/Makefile2
-rw-r--r--gnu/usr.bin/grep/Makefile15
2 files changed, 15 insertions, 2 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 0ee257f..95eeeb8 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -27,9 +27,7 @@ _groff= groff
.endif
.endif
-.if ${MK_BSD_GREP} != "yes"
_grep= grep
-.endif
.if ${MK_CVS} != "no"
_cvs= cvs
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index b0c3988..7d3b607 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,35 +1,50 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
GREP_LIBZ=YES
+.if ${MK_BSD_GREP} != "yes"
PROG= grep
+.else
+PROG= gnugrep
+.endif
SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
xstrtoumax.c
CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
+.if ${MK_BSD_GREP} != "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep
MLINKS= grep.1 egrep.1 grep.1 fgrep.1
+.endif
DPADD= ${LIBGNUREGEX} ${LIBBZ2}
LDADD= -lgnuregex -lbz2
+.if ${MK_BSD_GREP} != "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
${BINDIR}/grep ${BINDIR}/bzegrep \
${BINDIR}/grep ${BINDIR}/bzfgrep
MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1
+.endif
.if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
LDADD+= -lz
DPADD+= ${LIBZ}
CFLAGS+=-DHAVE_LIBZ=1
+.if ${MK_BSD_GREP} != "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \
${BINDIR}/grep ${BINDIR}/zegrep \
${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
.endif
+.endif
+
+gnugrep.1: grep.1
+ cp ${.ALLSRC} ${.TARGET}
SUBDIR+=doc
OpenPOWER on IntegriCloud