support for USELOCALTOOLS

diff --git a/Imakefile b/Imakefile
index baf91092c18722538419bec5c77cc5ef71b22674..cc29edaff58e64a49468adf4d88d1ba68eae2e24 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -10,8 +10,8 @@
 
 #define have_subdirs
 CODE=Imakefile
-CLIENTDIRS=util gdb rpc clients man mrtest update
-SRVRDIRS=server backup db dbck dcm gen reg_svr incremental regtape
+CLIENTDIRS=util include gdb lib clients man update
+SVRDIRS=server db backup dbck dcm gen reg_svr incremental regtape
 #ifdef SVRBUILD
 SUBDIRS=$(CLIENTDIRS) $(SVRDIRS)
 #else
@@ -20,6 +20,8 @@ SUBDIRS=$(CLIENTDIRS)
 
 all:: 
 
+#ifndef USELOCALTOOLS
+
 world::
        make ${MFLAGS} clean-imake
        make ${MFLAGS} Makefile
@@ -34,6 +36,16 @@ clean-imake:
 imake::
        cd util/imake; make 
 
+#else /* USELOCALTOOLS */
+
+world::
+       make ${MFLAGS} Makefile
+       make ${MFLAGS} Makefiles
+       make ${MFLAGS} depend
+       make ${MFLAGS} all
+#endif /* USELOCALTOOLS */
+
+
 install::
        -mkdir ${DESTDIR}
        -mkdir ${DESTDIR}${USRDIR}
@@ -49,7 +61,13 @@ install::
        -mkdir ${DESTDIR}${MANDIR}/man8
        -mkdir ./bin
 
+#ifdef USELOCALTOOLS
 depend::
        cd util/makedepend; make
+#endif
+
+#ifdef USELOCALLIBS
+depend::
        cd util/et; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all
        cd util/ss; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all
+#endif