Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jan 2019 18:22:16 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r343050 - stable/12/usr.bin/grep
Message-ID:  <201901151822.x0FIMG9n025444@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Tue Jan 15 18:22:16 2019
New Revision: 343050
URL: https://svnweb.freebsd.org/changeset/base/343050

Log:
  MFC r342874: Fix bsdgrep manpage clobbering grep(1) with default build
  
  The default build should install bsdgrep(1) and grep(1), with the latter
  being gnugrep(1). WITH_BSD_GREP flips this situation such that we have
  gnugrep(1) and grep(1), with the latter being bsdgrep(1).
  
  Changes to start installing the zgrep script out of usr.bin/grep
  inadvertently altered the default build such that grep(1) was being
  installed, and it was bsdgrep(1). Correct the typo.

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

Modified: stable/12/usr.bin/grep/Makefile
==============================================================================
--- stable/12/usr.bin/grep/Makefile	Tue Jan 15 18:21:06 2019	(r343049)
+++ stable/12/usr.bin/grep/Makefile	Tue Jan 15 18:22:16 2019	(r343050)
@@ -10,7 +10,7 @@ MAN1=	grep.1 zgrep.1
 .else
 PROG=	bsdgrep
 CLEANFILES+= bsdgrep.1
-MAN1=	grep.1 zgrep.1
+MAN1=	bsdgrep.1 zgrep.1
 
 bsdgrep.1: grep.1
 	${CP} ${.ALLSRC} ${.TARGET}



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