diff options
| -rw-r--r-- | mk/defaults/mk.conf | 7 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index eab6e06c10e..fe65aa91788 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.121 2006/06/05 17:11:37 joerg Exp $ +# $NetBSD: mk.conf,v 1.122 2006/06/06 19:25:59 jlam Exp $ # # This file provides default values for variables that may be overridden @@ -434,11 +434,6 @@ EXTRACT_USING?= nbtar # Possible: any Fortran compiler # Default: none -#IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS} -# The imake binary to invoke. -# Possible: any path followed by any valid flags -# Default: ${X11BASE}/bin/imake ${IMAKEOPTS} - #IMAKEOPTS= # Options passed to imake(1). The defaults ensure that imake finds the # correct commands. diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 06a4223c1b9..5218ba0c9b2 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.168 2006/06/06 06:30:29 jlam Exp $ +# $NetBSD: replace.mk,v 1.169 2006/06/06 19:25:59 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -990,12 +990,6 @@ TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_} . endif .endfor # -# If IMAKE is defined, then use that as the path to the imake binary. -# -.if !defined(TOOLS_IGNORE.imake) && !empty(_USE_TOOLS:Mimake) && defined(IMAKE) -TOOLS_PATH.imake= ${IMAKE} -.endif -# # 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}. |