Use pre-defined make variables instead of hardcoded docbook2X and sed commands.
authorwwp <subscript@free.fr>
Tue, 14 Jul 2020 12:00:18 +0000 (14:00 +0200)
committerwwp <subscript@free.fr>
Tue, 14 Jul 2020 12:00:18 +0000 (14:00 +0200)
Use more portable docbook2html commands.

20 files changed:
manual/de/dist/html/Makefile.am
manual/de/dist/pdf/Makefile.am
manual/de/dist/ps/Makefile.am
manual/de/dist/txt/Makefile.am
manual/dist/html/Makefile.am
manual/dist/pdf/Makefile.am
manual/dist/ps/Makefile.am
manual/dist/txt/Makefile.am
manual/es/dist/html/Makefile.am
manual/es/dist/pdf/Makefile.am
manual/es/dist/ps/Makefile.am
manual/es/dist/txt/Makefile.am
manual/fr/dist/html/Makefile.am
manual/fr/dist/pdf/Makefile.am
manual/fr/dist/ps/Makefile.am
manual/fr/dist/txt/Makefile.am
manual/pl/dist/html/Makefile.am
manual/pl/dist/pdf/Makefile.am
manual/pl/dist/ps/Makefile.am
manual/pl/dist/txt/Makefile.am

index 9b09880ca3dd4852ed23724cdffe4a612ea625cf..391a8ab7314d9877a85854a59d864ed5fe7a2856 100644 (file)
@@ -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
index c5a3b9e775583d59332e6a5610dae16b2f9aab90..d34fc4a5b1d020db4c66737ffd86bfd88f81a3d6 100644 (file)
@@ -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
index 8c2ca0326b1f755b0679265224a61c155102b691..5c4f0f4cc993b87ea571b146b1f4bae51cf7263e 100644 (file)
@@ -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
index 26017b6ed6fdbf58a89f951d306463b2038eb594..51eca84f108d38ce3af3f46cb7db39716bbf872d 100644 (file)
@@ -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
index cf1d577eebd15a3a6cc2f5c6696bb98ed96dbc56..babe8f65049e8b338b0d292e35c2d056d3fe6d1b 100644 (file)
@@ -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
index 10329e28fdd5f7a4f9201a45eb9fece73265d213..b527db5694c70a633f4dac02e75c2ae6b3f395a0 100644 (file)
@@ -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
index 0c82b5762c134c59d07fdf9a7572562f99edf1bb..9d27ca8c17b97ea8684a80bd6ecc1b5ec5734b20 100644 (file)
@@ -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
index afda9927257a46c957d47bcf155a5900867aa4fa..fd29137a693d1cabdb54f44c2ed144b9d828e7d0 100644 (file)
@@ -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
index 05cec3a1bdd7d473fd40420a8452bb2747a61c9b..977c6e8e0e88b6d4878acfd1fefff2d8190bbb80 100644 (file)
@@ -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
index ac779fb25935b775781a23766aaf67b67db28322..10be1b3ecb7cc04d502246e47e84709162f62662 100644 (file)
@@ -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
index fa3e9367bd2812ba202f58b1a9b0b5d1a0cf81cc..debcc978a98b73b92aba12c420ebb64ed91f605f 100644 (file)
@@ -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
index 8ced198138e9316b607568c06756f0f3293f561f..44d88842660bdc61bb4c7167434d67e5cd397dd0 100644 (file)
@@ -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
index 0a0498131d10d27b9058cef8f14176fab63c8ac3..e48304be4bc835a66f9907e5afe293ff6aa08386 100644 (file)
@@ -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
index 2c8f1c31d41b538bc23adb61cb978ba391260dba..100d79b8d696cc287fe2b7c25393e0a59ab742e7 100644 (file)
@@ -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
index bb9a6da2df606e9236c3ce187874d0551f8f93dd..4e43045e81334dc72933991e190e5a6dcdc12984 100644 (file)
@@ -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
index 16476797550b9134fdb3f11be7fda14da4f03fff..42d680766ff1064e4effeea315e6bfcaedb9aa15 100644 (file)
@@ -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
index 680e4a4cd4f6b82e5a8ec074a6332619b8c6343f..ea14590f56b5f2157545651cccd9342c8cbc8e70 100644 (file)
@@ -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
index a599acec1a2ab61e20f5539328df6f6e10fd1567..c469da32b797804f9557858c8cb46c9a49f2530f 100644 (file)
@@ -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
index 64ad9c075fd4a702adbb49ae778a17625d9fd688..266644ff5431bc8a347cfa9be0e69d68af530388 100644 (file)
@@ -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
index 17f970fdcab573b17eb47c04ffcc54eaf10020bd..226529f03cb3727870db87f3355a1d9168a7cb09 100644 (file)
@@ -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