[Commits] [SCM] claws branch, master, updated. 3.17.6-1-gaecf6d5c2

wwp at claws-mail.org wwp at claws-mail.org
Tue Jul 14 14:02:50 CEST 2020


The branch, master has been updated
       via  aecf6d5c2d0a0dff8d30749fd1e97ef893816c25 (commit)
      from  f5489877c862f924eced1ae9a2acbcf5206ccf36 (commit)

Summary of changes:
 manual/de/dist/html/Makefile.am | 6 +++---
 manual/de/dist/pdf/Makefile.am  | 2 +-
 manual/de/dist/ps/Makefile.am   | 2 +-
 manual/de/dist/txt/Makefile.am  | 2 +-
 manual/dist/html/Makefile.am    | 6 +++---
 manual/dist/pdf/Makefile.am     | 2 +-
 manual/dist/ps/Makefile.am      | 2 +-
 manual/dist/txt/Makefile.am     | 2 +-
 manual/es/dist/html/Makefile.am | 6 +++---
 manual/es/dist/pdf/Makefile.am  | 2 +-
 manual/es/dist/ps/Makefile.am   | 2 +-
 manual/es/dist/txt/Makefile.am  | 2 +-
 manual/fr/dist/html/Makefile.am | 6 +++---
 manual/fr/dist/pdf/Makefile.am  | 2 +-
 manual/fr/dist/ps/Makefile.am   | 2 +-
 manual/fr/dist/txt/Makefile.am  | 2 +-
 manual/pl/dist/html/Makefile.am | 6 +++---
 manual/pl/dist/pdf/Makefile.am  | 2 +-
 manual/pl/dist/ps/Makefile.am   | 2 +-
 manual/pl/dist/txt/Makefile.am  | 2 +-
 20 files changed, 30 insertions(+), 30 deletions(-)


- Log -----------------------------------------------------------------
commit aecf6d5c2d0a0dff8d30749fd1e97ef893816c25
Author: wwp <subscript at free.fr>
Date:   Tue Jul 14 14:00:18 2020 +0200

    Use pre-defined make variables instead of hardcoded docbook2X and sed commands.
    Use more portable docbook2html commands.

diff --git a/manual/de/dist/html/Makefile.am b/manual/de/dist/html/Makefile.am
index 9b09880ca..391a8ab73 100644
--- a/manual/de/dist/html/Makefile.am
+++ b/manual/de/dist/html/Makefile.am
@@ -22,10 +22,10 @@ claws-mail-manual.html: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-env SP_ENCODING=xml docbook2html -u -o . \
+	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
 		../../claws-mail-manual.xml
-	-mv claws-mail-manual.html claws-mail-manual.html.raw
-	-sed 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
+	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
+	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
diff --git a/manual/de/dist/pdf/Makefile.am b/manual/de/dist/pdf/Makefile.am
index c5a3b9e77..d34fc4a5b 100644
--- a/manual/de/dist/pdf/Makefile.am
+++ b/manual/de/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/de/dist/ps/Makefile.am b/manual/de/dist/ps/Makefile.am
index 8c2ca0326..5c4f0f4cc 100644
--- a/manual/de/dist/ps/Makefile.am
+++ b/manual/de/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.ps
diff --git a/manual/de/dist/txt/Makefile.am b/manual/de/dist/txt/Makefile.am
index 26017b6ed..51eca84f1 100644
--- a/manual/de/dist/txt/Makefile.am
+++ b/manual/de/dist/txt/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.txt: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2txt -o . ../../claws-mail-manual.xml
+	-$(DOCBOOK2TXT) -o . ../../claws-mail-manual.xml
 	
 maintainer-clean:
 	-rm claws-mail-manual.txt
diff --git a/manual/dist/html/Makefile.am b/manual/dist/html/Makefile.am
index cf1d577ee..babe8f650 100644
--- a/manual/dist/html/Makefile.am
+++ b/manual/dist/html/Makefile.am
@@ -22,10 +22,10 @@ claws-mail-manual.html: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-env SP_ENCODING=xml docbook2html -u -o . \
+	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
 		../../claws-mail-manual.xml
-	-mv claws-mail-manual.html claws-mail-manual.html.raw
-	-sed 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
+	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
+	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
diff --git a/manual/dist/pdf/Makefile.am b/manual/dist/pdf/Makefile.am
index 10329e28f..b527db569 100644
--- a/manual/dist/pdf/Makefile.am
+++ b/manual/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml
-	-docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/dist/ps/Makefile.am b/manual/dist/ps/Makefile.am
index 0c82b5762..9d27ca8c1 100644
--- a/manual/dist/ps/Makefile.am
+++ b/manual/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.ps
diff --git a/manual/dist/txt/Makefile.am b/manual/dist/txt/Makefile.am
index afda99272..fd29137a6 100644
--- a/manual/dist/txt/Makefile.am
+++ b/manual/dist/txt/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.txt: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2txt -o . ../../claws-mail-manual.xml
+	-$(DOCBOOK2TXT) -o . ../../claws-mail-manual.xml
 	
 maintainer-clean:
 	-rm claws-mail-manual.txt
diff --git a/manual/es/dist/html/Makefile.am b/manual/es/dist/html/Makefile.am
index 05cec3a1b..977c6e8e0 100644
--- a/manual/es/dist/html/Makefile.am
+++ b/manual/es/dist/html/Makefile.am
@@ -22,10 +22,10 @@ claws-mail-manual.html: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-env SP_ENCODING=xml docbook2html -u -o . \
+	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
 		../../claws-mail-manual.xml
-	-mv claws-mail-manual.html claws-mail-manual.html.raw
-	-sed 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
+	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
+	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
diff --git a/manual/es/dist/pdf/Makefile.am b/manual/es/dist/pdf/Makefile.am
index ac779fb25..10be1b3ec 100644
--- a/manual/es/dist/pdf/Makefile.am
+++ b/manual/es/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/es/dist/ps/Makefile.am b/manual/es/dist/ps/Makefile.am
index fa3e9367b..debcc978a 100644
--- a/manual/es/dist/ps/Makefile.am
+++ b/manual/es/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.ps
diff --git a/manual/es/dist/txt/Makefile.am b/manual/es/dist/txt/Makefile.am
index 8ced19813..44d888426 100644
--- a/manual/es/dist/txt/Makefile.am
+++ b/manual/es/dist/txt/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.txt: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2txt -o . ../../claws-mail-manual.xml
+	-$(DOCBOOK2TXT) -o . ../../claws-mail-manual.xml
 	
 maintainer-clean:
 	-rm claws-mail-manual.txt
diff --git a/manual/fr/dist/html/Makefile.am b/manual/fr/dist/html/Makefile.am
index 0a0498131..e48304be4 100644
--- a/manual/fr/dist/html/Makefile.am
+++ b/manual/fr/dist/html/Makefile.am
@@ -22,10 +22,10 @@ claws-mail-manual.html: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-env SP_ENCODING=xml docbook2html -u -o . \
+	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
 		../../claws-mail-manual.xml
-	-mv claws-mail-manual.html claws-mail-manual.html.raw
-	-sed 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
+	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
+	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
diff --git a/manual/fr/dist/pdf/Makefile.am b/manual/fr/dist/pdf/Makefile.am
index 2c8f1c31d..100d79b8d 100644
--- a/manual/fr/dist/pdf/Makefile.am
+++ b/manual/fr/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/fr/dist/ps/Makefile.am b/manual/fr/dist/ps/Makefile.am
index bb9a6da2d..4e43045e8 100644
--- a/manual/fr/dist/ps/Makefile.am
+++ b/manual/fr/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.ps
diff --git a/manual/fr/dist/txt/Makefile.am b/manual/fr/dist/txt/Makefile.am
index 164767975..42d680766 100644
--- a/manual/fr/dist/txt/Makefile.am
+++ b/manual/fr/dist/txt/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.txt: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2txt -o . ../../claws-mail-manual.xml
+	-$(DOCBOOK2TXT) -o . ../../claws-mail-manual.xml
 	
 maintainer-clean:
 	-rm claws-mail-manual.txt
diff --git a/manual/pl/dist/html/Makefile.am b/manual/pl/dist/html/Makefile.am
index 680e4a4cd..ea14590f5 100644
--- a/manual/pl/dist/html/Makefile.am
+++ b/manual/pl/dist/html/Makefile.am
@@ -22,10 +22,10 @@ claws-mail-manual.html: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-env SP_ENCODING=xml docbook2html -u -o . \
+	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
 		../../claws-mail-manual.xml
-	-mv claws-mail-manual.html claws-mail-manual.html.raw
-	-sed 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
+	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
+	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
diff --git a/manual/pl/dist/pdf/Makefile.am b/manual/pl/dist/pdf/Makefile.am
index a599acec1..c469da32b 100644
--- a/manual/pl/dist/pdf/Makefile.am
+++ b/manual/pl/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/pl/dist/ps/Makefile.am b/manual/pl/dist/ps/Makefile.am
index 64ad9c075..266644ff5 100644
--- a/manual/pl/dist/ps/Makefile.am
+++ b/manual/pl/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
+	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
 	
 maintainer-clean:
 	-rm claws-mail-manual.ps
diff --git a/manual/pl/dist/txt/Makefile.am b/manual/pl/dist/txt/Makefile.am
index 17f970fdc..226529f03 100644
--- a/manual/pl/dist/txt/Makefile.am
+++ b/manual/pl/dist/txt/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.txt: \
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2txt -o . ../../claws-mail-manual.xml
+	-$(DOCBOOK2TXT) -o . ../../claws-mail-manual.xml
 	
 maintainer-clean:
 	-rm claws-mail-manual.txt

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list