Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Jan 2019 02:47:08 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r342874 - head/usr.bin/grep
Message-ID:  <201901090247.x092l8qA004581@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Wed Jan  9 02:47:07 2019
New Revision: 342874
URL: https://svnweb.freebsd.org/changeset/base/342874

Log:
  Fix bsdgrep manpage clobbering grep(1) with default build options
  
  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.
  
  Reported by:	bcran
  MFC after:	3 days

Modified:
  head/usr.bin/grep/Makefile

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Wed Jan  9 01:16:35 2019	(r342873)
+++ head/usr.bin/grep/Makefile	Wed Jan  9 02:47:07 2019	(r342874)
@@ -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?201901090247.x092l8qA004581>