diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-10 22:17:58 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-10 22:17:58 +0000 |
| commit | eb27d05acd6cdd303925959c632ab5de09456404 (patch) | |
| tree | 4fdc9ac5af21a754777f64a21b678dc9ad8e2c94 /mk/tools | |
| parent | a6b62bc94f00f501d883f4ede9d01b1ac573e12f (diff) | |
| download | pkgsrc-eb27d05acd6cdd303925959c632ab5de09456404.tar.gz | |
Back out revision 1.172 of mk/tools/replace.mk -- we never want to
allow IMAKE to be set by anything other than the tools framework.
Modify the IRIX files so that the native imake is listed as a built-in
tool in the case where X11_TYPE is "native". Also, move the include
of tools/default.mk a bit lower in bsd.prefs.mk so that tools.${OPSYS}.mk
files can use the value of X11_TYPE. This should properly set and
point IMAKE to the right binary on IRIX without destroying the
configuration for platforms where IMAKE was not explicitly set, i.e.
every non-IRIX platform.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 7 | ||||
| -rw-r--r-- | mk/tools/tools.IRIX.mk | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 5d5273356d0..7da449f1eb6 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.172 2006/07/08 23:08:59 schwarz Exp $ +# $NetBSD: replace.mk,v 1.173 2006/07/10 22:17:58 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1000,10 +1000,7 @@ 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_} - # !empty(X11_TYPE:Mnative) -. elif defined(${_TOOLS_VARNAME.${_t_}}) && !empty(${_TOOLS_VARNAME.${_t_}}) -TOOLS_PATH.${_t_}= ${${_TOOLS_VARNAME.${_t_}}} -. else # tool not explicitly specified +. else # !empty(X11_TYPE:Mnative) TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_} . endif . endif diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk index fa37aa78fbe..1228ba883b8 100644 --- a/mk/tools/tools.IRIX.mk +++ b/mk/tools/tools.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.IRIX.mk,v 1.15 2005/11/04 20:02:01 jlam Exp $ +# $NetBSD: tools.IRIX.mk,v 1.16 2006/07/10 22:17:58 jlam Exp $ # # System-supplied tools for the IRIX operating system. @@ -37,6 +37,9 @@ TOOLS_PLATFORM.gzip?= /usr/sbin/gzip -nf ${GZIP} TOOLS_PLATFORM.head?= /usr/bsd/head TOOLS_PLATFORM.hostname?= /usr/bsd/hostname TOOLS_PLATFORM.id?= /usr/bin/id +.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) && exists(/usr/bin/X11/imake) +TOOLS_PLATFORM.imake?= /usr/bin/X11/imake +.endif TOOLS_PLATFORM.ln?= /sbin/ln TOOLS_PLATFORM.ls?= /sbin/ls TOOLS_PLATFORM.m4?= /sbin/m4 |