support for USELOCALTOOLS and include files in ~/lib

diff --git a/util/imake.includes/Imake.tmpl b/util/imake.includes/Imake.tmpl
index 2b411182af68c6f1b329351a205e22ebeb54a48c..e99fc230175ce3197d95496b9620008b60315096 100644 (file)
--- a/util/imake.includes/Imake.tmpl
+++ b/util/imake.includes/Imake.tmpl
@@ -4,8 +4,6 @@
 /**/# Ignore this message if you are not using imake.
 /**/#
 /**/#  $Source$
-/**/#  $Author$
-/**/#  $Header$
 /**/#
 
 #ifndef NEW_TOP
@@ -16,12 +14,17 @@ NEWTOP=NEW_TOP
 BUILDTOP=NEW_TOP
 #endif
 
+#ifndef USELOCALTOOLS
 /* The makedepend program */
 DEPEND=$(BUILDTOP)/util/makedepend/makedepend
 /* The Imake command line */
 IMAKE=$(BUILDTOP)/util/imake/imake -I$(BUILDTOP)/util/imake.includes
+#else
+DEPEND=makedepend
+IMAKE=imake -I$(BUILDTOP)/util/imake.includes
+#endif
 
-INCLUDE= -I$(BUILDTOP)/include
+INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib
 CFLAGS=$(DBG) $(INCLUDE) $(DEFINES) $(GLOBAL_CDEFS)
 LINTFLAGS=$(INCLUDE) $(DEFINES) $(GLOBAL_CDEFS)
 #include "config.Imakefile"
@@ -46,4 +49,3 @@ install::
 Makefiles::
 
 /**/# DO NOT DELETE THIS LINE
-