janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 05:47:38 +01:00
Code Activity

topdir.mk: Don't set default SUBDIRS if ORDERED_SUBDIRS is set

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-30 16:23:07 +00:00
commit 6a4092b8af
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/topdir.mk
View file

@ -5,9 +5,12 @@ distclean: topdir.distclean
config: config:
mrproper:distclean topdir.mrproper mrproper:distclean topdir.mrproper
ifeq ($(ORDERED_SUBDIRS),)
SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \
tools include lib bin util plugins conf config cfg \ tools include lib bin util plugins conf config cfg \
images htdocs tmpl doc test inst/post) images htdocs tmpl doc test inst/post)
endif
PROJECT_DESCR = $(TOPDIR)/make/project.conf PROJECT_DESCR = $(TOPDIR)/make/project.conf
GIT_DESCR = $(TOPDIR)/.git/description GIT_DESCR = $(TOPDIR)/.git/description
LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files