X-Git-Url: https://git.ladys.computer/Caudex/blobdiff_plain/94025c0529851882c0e1c1fa6b61491a5979ada9..6d98a2ce12b6fb6f09ffa7517578be53e76776bd:/GNUmakefile?ds=inline diff --git a/GNUmakefile b/GNUmakefile index 5602ca0..130312c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -181,7 +181,7 @@ override ensuredirectory = if $(TEST) ! -d $(call quote,$1); then $(MKDIR) -p $( # (callable) Test to see if the dependencies provided by the second argument matches the value in the file corresponding to the first argument in `$(BUILDDIR)/lastprereqs´. # If not, return the third argument, plus an additional rule to save the new prerequisites. -override makeandsavedeps = $(if $(subst $(shell $(CAT) $(call quote,$(BUILDDIR)/lastdeps/$1) 2> /dev/null || true),,$2),$3$(newline)$(silent)$(call ensuredirectory,$(BUILDDIR)/lastdeps)$(newline)$(silent)$(PRINTF) '%s\n' $(call quote,$2) > $(BUILDDIR)/lastdeps/$1,) +override makeandsavedeps = $(if $(or $(if $2,,1),$(subst $(shell $(CAT) $(call quote,$(BUILDDIR)/lastdeps/$1) 2> /dev/null || true),,$2)),$3$(newline)$(silent)$(call ensuredirectory,$(BUILDDIR)/lastdeps)$(newline)$(silent)$(PRINTF) '%s\n' $(call quote,$2) > $(BUILDDIR)/lastdeps/$1,) # (callable) Make the catalog for the provided category. override define makecategorycatalog @@ -268,9 +268,9 @@ FORCE : ; # ─ ¶ Build Targets ─────────────────────────────────────────────────── # Initialize the ⛩️📰 书社 repository if it is empty. -$(SHUSHE)/GNUmakefile : %/GNUmakefile : +$(SHUSHE)/GNUmakefile : $(THISDIR)/%/GNUmakefile : @$(PRINTF) '%s\n' $(call quote,Initializing git submodule at `$*´) - $(silent)$(GIT) submodule update --init $(call quote,$*) + $(silent)cd $(THISDIR) && $(GIT) submodule update --init $(call quote,$*) # Touch parsers and transforms if the files in `lib/´ have changed. $(PARSERS) $(TRANSFORMS) : $(wildcard lib/*.xslt)