From 011c470329c1681b9c151635367390bfc122fc48 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 8 Dec 2021 17:06:27 +0100 Subject: [latex/build] fix broken build when a deck has the same name as a set --- latex/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'latex') diff --git a/latex/Makefile b/latex/Makefile index 708b9f38..d1987b30 100644 --- a/latex/Makefile +++ b/latex/Makefile @@ -113,27 +113,29 @@ endef $(foreach texdir, $(SETS_TEXDIRS), $(eval $(call generateCardTexRules, $(texdir)))) define generatePdfRules -$(1)/%.pdf: %.tex $(COMMON_TEX_FILES) $(MAKEFILE_LIST) +$(1)/%.pdf: $(2)%.tex $(COMMON_TEX_FILES) $(MAKEFILE_LIST) @echo building $$@ @if test \( ! \( -d $$(@D) \) \) ;then mkdir -p $$(@D);fi $(VERBOSE) $(PDFLATEX_ENV) $(PDFLATEX) --output-directory $$(@D) $$< endef # Generate cards pdf rules -$(foreach pdfdir, $(SETS_BUILDDIRS), $(eval $(call generatePdfRules, $(pdfdir)))) +$(foreach pdfdir, $(SETS_BUILDDIRS), $(eval $(call generatePdfRules, $(pdfdir),))) +# Misc cards not in a set +$(eval $(call generatePdfRules, $(BUILDDIR),)) # Generate sets pdf rule -$(eval $(call generatePdfRules, $(SETS_PDF_DIR))) +$(eval $(call generatePdfRules, $(SETS_PDF_DIR), $(SETS_TEX_DIR)/)) # Generate decks pdf rule -$(eval $(call generatePdfRules, $(DECKS_PDF_DIR))) +$(eval $(call generatePdfRules, $(DECKS_PDF_DIR), $(DECKS_TEX_DIR)/)) .PHONY: all de en all: de en de: - $(MAKE) LANGUAGE=de cards-all sets + $(MAKE) LANGUAGE=de cards-all sets decks en: - $(MAKE) cards-all sets + $(MAKE) cards-all sets decks .PHONY: sets sets-tex sets-pdf sets: sets-tex sets-pdf -- cgit v1.2.3