[pkgsrc/trunk]: pkgsrc/mk/tools make sure the IMAKE definition, if set, is us...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed831b57e397
branches:  trunk
changeset: 515811:ed831b57e397
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sat Jul 08 23:08:59 2006 +0000

description:
make sure the IMAKE definition, if set, is used in case X11_TYPE is native

diffstat:

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

diffs (21 lines):

diff -r 19456bc0ff68 -r ed831b57e397 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sat Jul 08 22:38:58 2006 +0000
+++ b/mk/tools/replace.mk       Sat Jul 08 23:08:59 2006 +0000
@@ -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_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