[WINEDOCS] Make use of the new po4a

[Francois Gouget]

It has taken me longer than expected but po4a finally has the features 
we needed so Dimi imported a new version. Now it's time to update WineDocs.

PS: Dimi, before applying this patch you will need to merge the new po4a 
code from the vendor branch to the CVS tip. Since we did not modify po4a 
in the tip this should be pretty simple:
    cd po4a
    cvs update -jpo4a-0_21 -jpo4a-cvs_20050630
    cvs diff to review the merge and make sure there was no conflict
    cvs commit -m"Merged PO4A 20050630"


Changelog:

  * fr/.cvsignore
    fr/Makefile.in

    Now that Po4a can translate attributes we don't need the posgml+sed 
step.
    Po4a also handles the includes right now so we don't need to change 
the current directory anymore. This fixes out-of-tree builds.

-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: fr/.cvsignore
===================================================================
RCS file: /cvsroot/wine/docs/fr/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- fr/.cvsignore	25 May 2005 03:51:50 -0000	1.1
+++ fr/.cvsignore	1 Jul 2005 08:13:51 -0000
@@ -1,6 +1,6 @@
 Makefile
 wine-faq.html
 wine-faq.pdf
-wine-faq.posgml
+wine-faq.sgml
 wine-faq.ps
 wine-faq.txt
Index: fr/Makefile.in
===================================================================
RCS file: /cvsroot/wine/docs/fr/Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in
--- fr/Makefile.in	18 May 2005 20:41:07 -0000	1.2
+++ fr/Makefile.in	1 Jul 2005 08:13:51 -0000
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 
 LANG      = fr
 SGMLDIR   = $(TOPSRCDIR)/en
-DOCDIR    = $(TOPSRCDIR)/fr
 MIN_TRANS = 1
 
 WINEFAQ_SRCS = \
@@ -22,13 +21,10 @@ all: doc
 updatepo: $(ALLBOOKS:%=%.updatepo)
 
 %.updatepo:
-	cd $(SGMLDIR) && $(PO4AENV) perl $(PO4ADIR)/po4a-updatepo -f sgml -m $*.sgml -p $(DOCDIR)/$*.po
+	$(PO4AENV) perl $(PO4ADIR)/po4a-updatepo -f sgml -m $(SGMLDIR)/$*.sgml -p $(SRCDIR)/$*.po
 
-%.posgml: $(SGMLDIR)/%.sgml %.po
-	cd $(SGMLDIR) && $(PO4AENV) perl $(PO4ADIR)/po4a-translate -v -f sgml -m $*.sgml -p $(DOCDIR)/$*.po -l $(DOCDIR)/$*.posgml -k $(MIN_TRANS)
-
-%.sgml: %.posgml
-	sed -e 's/^<\(article .*\) lang="en">$$/<\1 lang="$(LANG)">/'  -e 's/^<\(book .*\) lang="en">$$/<\1 lang="$(LANG)">/' $*.posgml >$*.sgml || ($(RM) $*.sgml && false)
+%.sgml: $(SGMLDIR)/%.sgml %.po
+	$(PO4AENV) perl $(PO4ADIR)/po4a-translate -v -f sgml -m $(SGMLDIR)/$*.sgml -p $(SRCDIR)/$*.po -l $*.sgml -k $(MIN_TRANS)
 
 clean::
-	$(RM) $(ALLBOOKS:%=%.sgml) $(ALLBOOKS:%=%.posgml)
+	$(RM) $(ALLBOOKS:%=%.sgml)