[Commits] Makefile.am 1.1.2.4 1.1.2.5

[mones at claws-mail.org]

Update of /home/claws-mail/claws/manual/fr/dist/html
In directory srv:/tmp/cvs-serv26967/manual/fr/dist/html

Modified Files:
      Tag: gtk2
	Makefile.am 
Log Message:
2012-08-24 [mones]	3.8.1cvs35

	* manual/advanced.xml
		Keep alphabetic order of hidden options lost
		and update Clawsker URL.
	* manual/de/advanced.xml
	* manual/fr/advanced.xml
		Update Clawsker URL.
	* manual/es/advanced.xml
		Sync with English version and update Clawsker URL.
	* manual/de/dist/html/Makefile.am
	* manual/es/dist/html/Makefile.am
	* manual/fr/dist/html/Makefile.am
	* manual/pl/dist/html/Makefile.am
	* manual/dist/html/Makefile.am
		Fix bug 2723 'Missing encoding in generated html manual' 

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/manual/fr/dist/html/Attic/Makefile.am,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- Makefile.am	3 Oct 2010 07:58:30 -0000	1.1.2.4
+++ Makefile.am	24 Aug 2012 23:18:48 -0000	1.1.2.5
@@ -17,8 +17,12 @@
 	../../plugins.xml \
 	../../starting.xml \
 	../../claws-mail-manual.xml 
-	-docbook2html -u -o . ../../claws-mail-manual.xml
+	-env 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
 	
 maintainer-clean:
 	-rm claws-mail-manual.html
+	-rm claws-mail-manual.html.raw
 endif