summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-04-24 03:41:10 +0000
committerjlam <jlam@pkgsrc.org>2005-04-24 03:41:10 +0000
commitb9ba5fb74bda1ad067ed600fad9ed21f35f556af (patch)
tree58cffd06f7956752e1fc4d8fa0087082df8de827
parentc311032905ab7a9d9bb303fb736762d9a0798570 (diff)
downloadpkgsrc-b9ba5fb74bda1ad067ed600fad9ed21f35f556af.tar.gz
If "TOOL" is already defined, then we don't need to redefine it.
-rw-r--r--mk/tools/replace.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 602f844e0d4..a62ebdf84a1 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.7 2005/04/24 03:07:36 jlam Exp $
+# $NetBSD: replace.mk,v 1.8 2005/04/24 03:41:10 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions. The replacements are placed under
@@ -356,10 +356,8 @@ TOOLS_ARGS.${_t_}?= \
${${_TOOLS_VARNAME.${_t_}}:C/^/_asdf_/1:N_asdf_*}
. if !empty(TOOLS_ARGS.${_t_})
TOOLS_WRAP+= ${_t_}
-${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}}
. else
TOOLS_SYMLINK+= ${_t_}
-${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}}
. endif
. elif defined(TOOLS_REAL_CMD.${_t_})
${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}}