talons

commit bb087f25bc5cfe986cefb2578e31f302490de093
parent 54fe2ca4c3f03d43c5d66982f893e8349ba8c5ac
Author: wwp <subscript@free.fr>
Date:   Tue, 14 Jul 2020 14:00:18 +0200

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

Diffstat:
M
manual/de/dist/html/Makefile.am
 | 
6
+++---
M
manual/de/dist/pdf/Makefile.am
 | 
2
+-
M
manual/de/dist/ps/Makefile.am
 | 
2
+-
M
manual/de/dist/txt/Makefile.am
 | 
2
+-
M
manual/dist/html/Makefile.am
 | 
6
+++---
M
manual/dist/pdf/Makefile.am
 | 
2
+-
M
manual/dist/ps/Makefile.am
 | 
2
+-
M
manual/dist/txt/Makefile.am
 | 
2
+-
M
manual/es/dist/html/Makefile.am
 | 
6
+++---
M
manual/es/dist/pdf/Makefile.am
 | 
2
+-
M
manual/es/dist/ps/Makefile.am
 | 
2
+-
M
manual/es/dist/txt/Makefile.am
 | 
2
+-
M
manual/fr/dist/html/Makefile.am
 | 
6
+++---
M
manual/fr/dist/pdf/Makefile.am
 | 
2
+-
M
manual/fr/dist/ps/Makefile.am
 | 
2
+-
M
manual/fr/dist/txt/Makefile.am
 | 
2
+-
M
manual/pl/dist/html/Makefile.am
 | 
6
+++---
M
manual/pl/dist/pdf/Makefile.am
 | 
2
+-
M
manual/pl/dist/ps/Makefile.am
 | 
2
+-
M
manual/pl/dist/txt/Makefile.am
 | 
2
+-

20 files changed, 30 insertions(+), 30 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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