svn commit: r226853 - stable/9/usr.bin/grep

Gabor Kovesdan gabor at FreeBSD.org
Thu Oct 27 19:18:54 UTC 2011


Author: gabor
Date: Thu Oct 27 19:18:54 2011
New Revision: 226853
URL: http://svn.freebsd.org/changeset/base/226853

Log:
  MFC r226664:
  - Install BSD grep properly, based on the value of WITH_BSD_GREP
  
  Approved by:	re (kib)

Modified:
  stable/9/usr.bin/grep/Makefile
Directory Properties:
  stable/9/usr.bin/grep/   (props changed)

Modified: stable/9/usr.bin/grep/Makefile
==============================================================================
--- stable/9/usr.bin/grep/Makefile	Thu Oct 27 18:49:16 2011	(r226852)
+++ stable/9/usr.bin/grep/Makefile	Thu Oct 27 19:18:54 2011	(r226853)
@@ -53,12 +53,14 @@ DPADD=	${LIBZ} ${LIBLZMA}
 LDADD+=	-lbz2
 DPADD+=	${LIBBZ2}
 
+.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
 .else
 CFLAGS+= -DWITHOUT_BZIP2
 .endif


More information about the svn-src-stable-9 mailing list