[pkgsrc/trunk]: pkgsrc/mk/tools If we're using the tools from the packages, s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ff68782ca76
branches:  trunk
changeset: 493365:7ff68782ca76
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed May 04 06:25:59 2005 +0000

description:
If we're using the tools from the packages, set TOOLS_REAL_CMD.*
unconditionally so they will correctly refer to the packages' tools.

diffstat:

 mk/tools/imake.mk |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (36 lines):

diff -r 5f8b3e362bc7 -r 7ff68782ca76 mk/tools/imake.mk
--- a/mk/tools/imake.mk Wed May 04 05:20:47 2005 +0000
+++ b/mk/tools/imake.mk Wed May 04 06:25:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.1 2005/05/02 21:10:03 jlam Exp $
+# $NetBSD: imake.mk,v 1.2 2005/05/04 06:25:59 jlam Exp $
 #
 # This Makefile fragment handles packages that need imake and xmkmf
 # to build X11-related packages.  The correct imake and xmkmf tools
@@ -60,18 +60,18 @@
 #
 .    if defined(X11_TYPE) && (${X11_TYPE} == "XFree86")
 TOOLS_DEPENDS.imake?=          imake>=4.4.0:../../x11/imake
-TOOLS_REAL_CMD.imake?=         ${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
-TOOLS_REAL_CMD.xmkmf?=         ${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
+TOOLS_REAL_CMD.imake=          ${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
+TOOLS_REAL_CMD.xmkmf=          ${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
 .    elif defined(X11_TYPE) && (${X11_TYPE} == "xorg")
 TOOLS_DEPENDS.imake?=          xorg-imake>=6.8:../../x11/xorg-imake
-TOOLS_REAL_CMD.imake?=         ${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
-TOOLS_REAL_CMD.xmkmf?=         ${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
+TOOLS_REAL_CMD.imake=          ${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
+TOOLS_REAL_CMD.xmkmf=          ${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
 .    else # ${X11_TYPE} == "native"
-TOOLS_REAL_CMD.imake?=         ${X11BASE}/bin/imake
-TOOLS_REAL_CMD.xmkmf?=         ${X11BASE}/bin/xmkmf
+TOOLS_REAL_CMD.imake=          ${X11BASE}/bin/imake
+TOOLS_REAL_CMD.xmkmf=          ${X11BASE}/bin/xmkmf
 .    endif
-TOOLS_ARGS.imake?=             ${IMAKEOPTS}
-TOOLS_ARGS.xmkmf?=             ${XMKMF_FLAGS}
+TOOLS_ARGS.imake=              ${IMAKEOPTS}
+TOOLS_ARGS.xmkmf=              ${XMKMF_FLAGS}
 #
 # Add any extra tools that may be required when using imake, e.g. gmake.
 #