janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

topdir.mk + dirs.mk fix: $(PREREQ_DIRS_DONE) was not checked

Browse source 
dirs-all.done doesn\'t check $(PREREQ_DIRS_DONE), this commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-07-01 17:37:10 +00:00
commit 07abf3f93e
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/dirs.mk
View file

@ -45,7 +45,7 @@ ifneq ($(DONT_CHECK_PREREQ_PROJECTS),true)
endif endif
# explicit duplication of pattern-rule is needed, otherwise .PHONY: dirs-all.done won't match # explicit duplication of pattern-rule is needed, otherwise .PHONY: dirs-all.done won't match
dirs-all.done: dirs-all.done: $(PREREQ_DIRS_DONE)
touch started-dirs-all.done touch started-dirs-all.done
set -e; for d in $(SUBDIRS_TO_ITERATE) ; do make -wC $$d $*; done set -e; for d in $(SUBDIRS_TO_ITERATE) ; do make -wC $$d $*; done
ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifneq ($(DONT_CHECK_PREREQ_DONE),true)

3
make/topdir.mk
View file

@ -37,8 +37,6 @@ include $(JWBDIR)/make/defs.mk
REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT) REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR)
include $(JWBDIR)/make/dirs.mk
ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifneq ($(DONT_CHECK_PREREQ_DONE),true)
ifndef PREREQ ifndef PREREQ
PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT)) PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
@ -59,6 +57,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
endif endif
include $(JWBDIR)/make/dirs.mk
include $(JWBDIR)/make/rpmdist.mk include $(JWBDIR)/make/rpmdist.mk
include $(JWBDIR)/make/rules.mk include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/doc-rules.mk include $(JWBDIR)/make/doc-rules.mk