diff --git a/make/dirs.mk b/make/dirs.mk
index a06b97c0..d210e25d 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -7,7 +7,9 @@
 
 include $(MODDIR)/make/defs.mk
 
-ifndef SUBDIRS
+SUBDIRS ?= $(FIND_SUBDIRS)
+
+ifeq ($(SUBDIRS),)
 all:
 subdirs:
 clean distclean:
@@ -21,8 +23,8 @@ install:
 	$(make_subdirs_target)
 
 clean:
-	rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
 	$(make_subdirs_target)
+	rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
 
 distclean: rmdistclean clean
 rmdistclean: