[pkgsrc/trunk]: pkgsrc/mk/tools We only need to recognize TOOLS_IGNORE.* in t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f9ba1a543ff
branches:  trunk
changeset: 497364:4f9ba1a543ff
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 25 21:51:19 2005 +0000

description:
We only need to recognize TOOLS_IGNORE.* in the case where the tool
is pkgsrc-supplied.  In other cases, e.g. using the system tool,
falling back toS the system tool, etc., we should still create wrappers
and set "TOOL" variables.

diffstat:

 mk/tools/replace.mk |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r b5c7b609ea7c -r 4f9ba1a543ff mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Jul 25 21:08:29 2005 +0000
+++ b/mk/tools/replace.mk       Mon Jul 25 21:51:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.120 2005/07/19 04:18:51 jlam Exp $
+# $NetBSD: replace.mk,v 1.121 2005/07/25 21:51:19 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1152,8 +1152,8 @@
 ######################################################################
 
 .for _t_ in ${_USE_TOOLS}
-.  if !defined(TOOLS_IGNORE.${_t_})
-.    if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
+.  if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
+      !defined(TOOLS_IGNORE.${_t_})
 #####
 ##### Add the dependencies for each pkgsrc-supplied tool.
 #####
@@ -1164,7 +1164,7 @@
 .          endif
 .        endfor
 .      endif
-.    elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
+.  elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 #####
 ##### For each system-supplied tool, break the tool down into a path
 ##### and arguments so that either a symlink or a wrapper will be
@@ -1175,7 +1175,6 @@
        ${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
 TOOLS_ARGS.${_t_}?=    \
        ${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:N_asdf_*}
-.    endif
 .  endif
 ###
 ### For each tool, TOOLS_CMDLINE.<tool> is the full command (path and