summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/tools/replace.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 4698a773c2e..5d5273356d0 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.171 2006/07/05 04:32:10 jlam Exp $
+# $NetBSD: replace.mk,v 1.172 2006/07/08 23:08:59 schwarz Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1000,7 +1000,10 @@ TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
TOOLS_DEPENDS.${_t_}?= xorg-imake>=6.8:../../x11/xorg-imake
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=xorg-imake
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
-. else # !empty(X11_TYPE:Mnative)
+ # !empty(X11_TYPE:Mnative)
+. elif defined(${_TOOLS_VARNAME.${_t_}}) && !empty(${_TOOLS_VARNAME.${_t_}})
+TOOLS_PATH.${_t_}= ${${_TOOLS_VARNAME.${_t_}}}
+. else # tool not explicitly specified
TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_}
. endif
. endif