diff options
| author | jlam <jlam> | 2005-05-15 18:37:44 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-15 18:37:44 +0000 |
| commit | fb4d79a5ad35913bc770ab717885bc5c5c7e6d81 (patch) | |
| tree | 9fea2f6bc420a1c8cb637ab19928f36d84f00c8c | |
| parent | effa6da6ddd4e9f0f7a239fcd75dde06269b61b7 (diff) | |
| download | pkgsrc-fb4d79a5ad35913bc770ab717885bc5c5c7e6d81.tar.gz | |
If we're using xpkgwedge, we need to force using pkgxmkmf so that we
pick up the xpkgwedge imake config files.
| -rw-r--r-- | mk/tools/imake.mk | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index ae189cb9210..7adb68a241c 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake.mk,v 1.6 2005/05/10 19:25:06 jlam Exp $ +# $NetBSD: imake.mk,v 1.7 2005/05/15 18:37:44 jlam Exp $ # # This Makefile fragment handles packages that need imake and xmkmf # to build X11-related packages. The correct imake and xmkmf tools @@ -50,31 +50,31 @@ _TOOLS_USE_PKGSRC.imake= yes MAKEFLAGS+= TOOLS_IGNORE.imake= . else # -# If we're using xpkgwedge, then we need to invoke the special xmkmf -# script that will find imake config files in both ${PREFIX} and in -# ${X11BASE}. -# -. if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) -TOOLS_REAL_CMD.xmkmf?= ${X11PREFIX}/bin/pkgxmkmf -. endif -# # Depending on which X11_TYPE we're using, depend on the correct package # to pull in imake and xmkmf. # . 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_REAL_ARGS.imake?= ${IMAKEOPTS} +TOOLS_REAL_ARGS.xmkmf?= ${XMKMF_FLAGS} +# +# If we're using xpkgwedge, then we need to invoke the special xmkmf +# script that will find imake config files in both ${PREFIX} and in +# ${X11BASE}. +# +. if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) +TOOLS_REAL_CMD.xmkmf= ${X11PREFIX}/bin/pkgxmkmf . endif -TOOLS_REAL_ARGS.imake= ${IMAKEOPTS} -TOOLS_REAL_ARGS.xmkmf= ${XMKMF_FLAGS} # # Add any extra tools that may be required when using imake, e.g. gmake. # |