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

This commit is contained in:
schwarz 2006-07-08 23:08:59 +00:00
parent 9430e49307
commit c25fbde9c9

View file

@ -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