[pkgsrc/trunk]: pkgsrc/mk/tools To avoid errors, check that there is a TOOL v...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/328937f9549f
branches:  trunk
changeset: 493083:328937f9549f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 26 22:51:00 2005 +0000

description:
To avoid errors, check that there is a TOOL variable associated with
the tool before we set it.

diffstat:

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

diffs (36 lines):

diff -r b6ad740b07ad -r 328937f9549f mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Apr 26 22:31:34 2005 +0000
+++ b/mk/tools/replace.mk       Tue Apr 26 22:51:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.28 2005/04/26 22:31:34 jlam Exp $
+# $NetBSD: replace.mk,v 1.29 2005/04/26 22:51:00 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -193,7 +193,7 @@
 _TOOLS_USE_PKGSRC.${_t_}=      yes
 TOOLS_SYMLINK+=                        ${_t_}
 TOOLS_REAL_CMD.${_t_}=         ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}${_t_}
-.        if exists(${TOOLS_REAL_CMD.${_t_}})
+.        if defined(_TOOLS_VARNAME.${_t_}) && exists(${TOOLS_REAL_CMD.${_t_}})
 ${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_REAL_CMD.${_t_}}
 .        endif
 .      endfor
@@ -236,7 +236,7 @@
 _TOOLS_USE_PKGSRC.${_t_}=      yes
 TOOLS_SYMLINK+=                        ${_t_}
 TOOLS_REAL_CMD.${_t_}=         ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}${_t_}
-.        if exists(${TOOLS_REAL_CMD.${_t_}})
+.        if defined(_TOOLS_VARNAME.${_t_}) && exists(${TOOLS_REAL_CMD.${_t_}})
 ${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_REAL_CMD.${_t_}}
 .        endif
 .      endfor
@@ -324,7 +324,7 @@
 _TOOLS_USE_PKGSRC.${_t_}=      yes
 TOOLS_SYMLINK+=                        ${_t_}
 TOOLS_REAL_CMD.${_t_}=         ${LOCALBASE}/bin/${_t_}
-.        if exists(${TOOLS_REAL_CMD.${_t_}})
+.        if defined(_TOOLS_VARNAME.${_t_}) && exists(${TOOLS_REAL_CMD.${_t_}})
 ${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_REAL_CMD.${_t_}}
 .        endif
 .      endfor