From 14df6b25bbd08b4ec7409396d0d321b760091efb Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 4 Dec 2010 13:59:26 +0000
Subject: [PATCH] topdir.mk: Revert to using subdirs.mk

Revert to using subdirs.mk instead of dirs.mk in topdir.mk.

make config produces a clash between the phony target and some
modules having a subdirectory named "config", notably feedfs, jux and
casview (should be renamed to conf one day, all other modules have
"conf") with dirs.mk.
---
 make/topdir.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/topdir.mk b/make/topdir.mk
index 169b489e..ccd70ca5 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -1,7 +1,6 @@
 all: config
 install: topdir.install
 clean: topdir.clean
-distclean: topdir.distclean
 config:
 
 SUBDIRS ?= $(wildcard inst/pre make scripts tools src include lib bin \
@@ -12,11 +11,13 @@ ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
 endif
 
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/subdirs.mk
 include $(MODDIR)/make/rpmdist.mk
-include $(MODDIR)/make/dirs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/doc-rules.mk
 
+distclean: topdir.distclean
+
 INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
 
 local-%: