X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/30b805f1faac46df1aca5f12bdbdb4e22b21a33d..6ecbb8ad77d801cc0d9d06645bf59ab45ba4238f:/Imakefile

diff --git a/Imakefile b/Imakefile
index 1540055a..5efcf5ba 100644
--- a/Imakefile
+++ b/Imakefile
@@ -27,7 +27,7 @@ all::
 #ifndef USELOCALTOOLS
 
 world::
-	make ${MFLAGS} clean-imake
+	make ${MFLAGS} imake
 	make ${MFLAGS} Makefile
 	make ${MFLAGS} Makefiles
 	make ${MFLAGS} depend
@@ -42,10 +42,6 @@ world::
 	make ${MFLAGS} all
 #endif /* USELOCALTOOLS */
 
-clean-imake:
-	cd util/imake; make clean
-	cd util/imake; make
-
 imake::
 	cd util/imake; make 
 
@@ -64,19 +60,19 @@ install::
 	-mkdir ${DESTDIR}${MANDIR}/man8
 	-mkdir ./bin
 
-#ifdef USELOCALTOOLS
+#ifndef USELOCALTOOLS
 depend:: makedepend
 #endif
 
-#ifdef USELOCALLIBS
+#ifndef USELOCALLIBS
 depend:: et ss
 #endif
 
 et:
-	cd util/et; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+	cd util/et; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
 
 ss:
-	cd util/ss; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+	cd util/ss; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
 
 makedepend:
 	cd util/makedepend; make