svn commit: r222273 - in head: gnu/usr.bin gnu/usr.bin/grep tools/build/options usr.bin usr.bin/grep

Ulrich Spörlein uqs at spoerlein.net
Thu Jun 2 13:12:59 UTC 2011


On Wed, 25.05.2011 at 01:04:13 +0000, David E. O'Brien wrote:
> Author: obrien
> Date: Wed May 25 01:04:12 2011
> New Revision: 222273
> URL: http://svn.freebsd.org/changeset/base/222273
> 
> Log:
>   Build and install a BSD licensed grep.
>   If WITH_BSD_GREP is not set, it will be 'bsdgrep' and GNUgrep will be
>   '[ef]grep'.  Otherwise, BSD-grep will be the grep family, and GNUgrep
>   will be 'gnugrep'.
>   
>   Discussed with: brooks
> 
> Modified:
>   head/gnu/usr.bin/Makefile
>   head/gnu/usr.bin/grep/Makefile
>   head/tools/build/options/WITH_BSD_GREP
>   head/usr.bin/Makefile
>   head/usr.bin/grep/Makefile
> 
> Modified: head/gnu/usr.bin/Makefile
> ==============================================================================
> --- head/gnu/usr.bin/Makefile	Wed May 25 00:34:25 2011	(r222272)
> +++ head/gnu/usr.bin/Makefile	Wed May 25 01:04:12 2011	(r222273)
> @@ -27,9 +27,7 @@ _groff=		groff
>  .endif
>  .endif
>  
> -.if ${MK_BSD_GREP} != "yes"
>  _grep=          grep
> -.endif
>  

You should have done the same here as in usr.bin/Makefile, i.e. get rid
of the ${_grep} variable completely. Just saying ...

Uli


More information about the svn-src-all mailing list