From 6a4092b8af9ec5efc676614aca9be1bc2f68e4e8 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 30 Jan 2019 16:23:07 +0000 Subject: [PATCH] topdir.mk: Don't set default SUBDIRS if ORDERED_SUBDIRS is set If ORDERED_SUBDIRS is set, SUBDIRS should by default start with $(ORDERED_SUBDIRS), and filled up with what $(FIND_SUBDIRS) turns up. Signed-off-by: Jan Lindemann --- make/topdir.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make/topdir.mk b/make/topdir.mk index 4d951400..d6cf4fc7 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -5,9 +5,12 @@ distclean: topdir.distclean config: mrproper:distclean topdir.mrproper +ifeq ($(ORDERED_SUBDIRS),) SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \ tools include lib bin util plugins conf config cfg \ images htdocs tmpl doc test inst/post) +endif + PROJECT_DESCR = $(TOPDIR)/make/project.conf GIT_DESCR = $(TOPDIR)/.git/description LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files