[pkgsrc/trunk]: pkgsrc/mk/tools Don't condtionally set the "TOOL" variables.....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4776191735c
branches:  trunk
changeset: 493739:d4776191735c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 13 21:57:13 2005 +0000

description:
Don't condtionally set the "TOOL" variables... set them explicitly.  Also
fix variable name in the case where we're using the pkgsrc tool, since
we were referencing the wrong variable.

diffstat:

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

diffs (22 lines):

diff -r 76c2f6d60210 -r d4776191735c mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri May 13 21:13:01 2005 +0000
+++ b/mk/tools/replace.mk       Fri May 13 21:57:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.69 2005/05/12 03:57:40 jlam Exp $
+# $NetBSD: replace.mk,v 1.70 2005/05/13 21:57:13 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.
@@ -927,10 +927,10 @@
 .  if defined(_TOOLS_VARNAME.${_t_})
 .    if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
 .      if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
-${_TOOLS_VARNAME.${_t_}}?=     ${TOOLS_PLATFORM.${_t_}}
+${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_PLATFORM.${_t_}}
 .      endif
 .    else
-${_TOOLS_VARNAME.${_t_}}?=     ${TOOLS_${TOOLS_PLATFORM.${_t_}}}
+${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_${_TOOLS_VARNAME.${_t_}}}
 .    endif
 .  endif
 .endfor