Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jun 2011 01:32:18 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r223617 - user/gabor/tre-integration/usr.bin/grep
Message-ID:  <201106280132.p5S1WIjg022432@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gabor
Date: Tue Jun 28 01:32:18 2011
New Revision: 223617
URL: http://svn.freebsd.org/changeset/base/223617

Log:
  - Reduce diffs from HEAD

Modified:
  user/gabor/tre-integration/usr.bin/grep/Makefile

Modified: user/gabor/tre-integration/usr.bin/grep/Makefile
==============================================================================
--- user/gabor/tre-integration/usr.bin/grep/Makefile	Tue Jun 28 00:58:12 2011	(r223616)
+++ user/gabor/tre-integration/usr.bin/grep/Makefile	Tue Jun 28 01:32:18 2011	(r223617)
@@ -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=	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,8 +23,10 @@ MLINKS= grep.1 egrep.1 \
 	grep.1 zgrep.1 \
 	grep.1 zegrep.1 \
 	grep.1 zfgrep.1
+.endif
 
-WARNS?=	6
+bsdgrep.1: grep.1
+	cp ${.ALLSRC} ${.TARGET}
 
 LDADD=	-lz -lbz2
 DPADD=	${LIBZ} ${LIBBZ2}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106280132.p5S1WIjg022432>