[Commits] [SCM] claws branch, master, updated. 3.18.0-323-g67f11d627

[jonathan at claws-mail.org]

The branch, master has been updated
       via  67f11d6278e90c587aca21aa056a8f96a6ecd807 (commit)
      from  5ae9cfbe8572da548f163249669ac492242cff9c (commit)

Summary of changes:
 manual/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 67f11d6278e90c587aca21aa056a8f96a6ecd807
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jan 2 07:16:28 2022 -0700

    Don't assume docbook2pdf variable is set

diff --git a/manual/Makefile.am b/manual/Makefile.am
index 544311d2f..a3449825e 100644
--- a/manual/Makefile.am
+++ b/manual/Makefile.am
@@ -39,7 +39,7 @@ endef
 define BASE_template =
 $(1)/claws-mail-manual.$(2): $(manual_deps)
 	@$(MKDIR_P) $(1)/$(2)
-	$(DOCBOOK2PDF) -b $(2) -o $(1)/$(2) $$<
+	$(3) -o $(1)/$(2) $$<
 	mv -f $(1)/$(2)/claws-mail-manual.$(2) $$@
 	rm -rf $(1)/$(2)
 endef
@@ -53,19 +53,19 @@ endif
 if MANUAL_PDF
 nobase_dist_manualpdf_DATA=$(PDF_MANUALS)
 manualpdfdir=$(manualdir)
-$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),pdf)))
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),pdf,$(DOCBOOK2PDF))))
 endif
 
 if MANUAL_PS
 nobase_dist_manualps_DATA=$(PS_MANUALS)
 manualpsdir=$(manualdir)
-$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),ps)))
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),ps,$(DOCBOOK2PS))))
 endif
 
 if MANUAL_TXT
 nobase_dist_manualtxt_DATA=$(TXT_MANUALS)
 manualtxtdir=$(manualdir)
-$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),txt)))
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),txt,$(DOCBOOK2TXT))))
 endif
 
 maintainer-clean:

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail