$NetBSD$

--- config/cf/Imake.tmpl.orig	2001-03-07 08:08:22.000000000 -0500
+++ config/cf/Imake.tmpl
@@ -960,22 +960,22 @@ JPTCLIBDIR = JpTclLibDir
 #define LoaderLibPrefix /**/
 #endif
 #ifndef ImakeCmd
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define ImakeCmd imake
+#ifdef UseInstalled		/* Force use of itools' binary */
+#define ImakeCmd $(BINDIR)/imake
 #else
 #define ImakeCmd $(IMAKESRC)/imake
 #endif
 #endif
 #ifndef DependCmd
 #if UseGccMakeDepend
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd gccmakedep
+#ifdef UseInstalled		/* Force use of itools' binary */
+#define DependCmd $(BINDIR)/gccmakedep
 #else
 #define DependCmd $(DEPENDSRC)/gccmakedep
 #endif
 #else
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd makedepend
+#ifdef UseInstalled		/* Force use of itools' binary */
+#define DependCmd $(BINDIR)/makedepend
 #else
 #define DependCmd $(DEPENDSRC)/makedepend
 #endif
@@ -1001,8 +1001,8 @@ JPTCLIBDIR = JpTclLibDir
 # endif
 #endif
 #ifndef MkdirHierCmd
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define MkdirHierCmd mkdirhier
+#ifdef UseInstalled		/* Force use of itools' binary */
+#define MkdirHierCmd $(BINDIR)/mkdirhier
 #else
 #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
 #endif
