pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Make sure that USE_TOOLS contains all of "gre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/15897c03a83b
branches:  trunk
changeset: 492596:15897c03a83b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 16 05:16:29 2005 +0000

description:
Make sure that USE_TOOLS contains all of "grep egrep fgrep" if it
contains any one of them.  This causes the final loop to correctly
set TOOLS_REAL_CMD.{grep,egrep,fgrep} for all three tools.

diffstat:

 mk/tools/replace.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 098036ed150e -r 15897c03a83b mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sat Apr 16 03:48:47 2005 +0000
+++ b/mk/tools/replace.mk       Sat Apr 16 05:16:29 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.4 2005/04/15 17:55:33 jlam Exp $
+# $NetBSD: replace.mk,v 1.5 2005/04/16 05:16:29 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied tools
 # with pkgsrc versions.  The replacements are placed under ${TOOLS_DIR}
@@ -211,6 +211,11 @@
 MAKEFLAGS+=                    TOOLS_IGNORE.fgrep=
 MAKEFLAGS+=                    TOOLS_IGNORE.grep=
 .  else
+.    for _t_ in egrep fgrep grep
+.      if empty(USE_TOOLS:M${_t_})
+USE_TOOLS+=    ${_t_}
+.      endif
+.    endfor
 .    if !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])



Home | Main Index | Thread Index | Old Index