diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-04 06:25:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-04 06:25:59 +0000 |
| commit | 87e59af8e320baf35cd61153458873d4e8148f0b (patch) | |
| tree | e05943aaecb6e4db4179ba24493a957efd537139 /mk | |
| parent | d4677e12d91f278e19cb4f17d95aa7fbf4c1a064 (diff) | |
| download | pkgsrc-87e59af8e320baf35cd61153458873d4e8148f0b.tar.gz | |
If we're using the tools from the packages, set TOOLS_REAL_CMD.*
unconditionally so they will correctly refer to the packages' tools.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/imake.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index 7c0d5ea171e..da92d724cb5 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -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 @@ TOOLS_REAL_CMD.xmkmf?= ${X11PREFIX}/bin/pkgxmkmf # . 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. # |