trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/03/13 09:18:00

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        (generate-html): New variable containing canned command sequence
        for generating the HTML by po4a-translate.  All callers adopted.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ChangeLog   13 Mar 2008 08:52:08 -0000      1.32
+++ ChangeLog   13 Mar 2008 09:18:00 -0000      1.33
@@ -7,6 +7,8 @@
        ($(template_dir)/%.$(1).html, $(rootdir)/home.$(1).shtml)
        ($(subst /po/,/,$(1).html)): Run $(check-po) to validate PO files,
        defining the PO variable accordingly.
+       (generate-html): New variable containing canned command sequence
+       for generating the HTML by po4a-translate.  All callers adopted.
 
        * gnun.mk: Doc fix.
 

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- GNUmakefile 13 Mar 2008 08:52:08 -0000      1.15
+++ GNUmakefile 13 Mar 2008 09:18:00 -0000      1.16
@@ -136,6 +136,13 @@
 $(RM) address@hidden
 endef
 
+# The command to generate the translated article in HTML format from a
+# PO file.  The result is further manipulated in the recipes.
+define generate-html
+$(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
+  --master $$< --po $$$$POFILE --localized $$$$M4FILE
+endef
+
 # The command to check the validity of a PO file.
 define check-po
 ./mailfail $(NOTIFYSKIP) $(transl_addr) \
@@ -192,9 +199,7 @@
 $(template_dir)/%.$(1).html: $(template_dir)/%.html 
$(template_dir)/po/%.$(1).po
        $$(addfile)
        PO=$(template_dir)/po/$$(*F).$(1).po ; $(check-po)
-       @echo Generating the translated article...
-       $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po \
-               $(template_dir)/po/$$(*F).$(1).po --localized $$@
+       POFILE=$(template_dir)/po/$$(*F).$(1).po M4FILE=$$@ ; $(generate-html)
        $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $$@
 endef
 
@@ -229,7 +234,8 @@
                            $(rootdir)/po/home.$(1).po generic.$(1).html
        $$(addfile)
        PO=$(rootdir)/po/home.$(1).po ; $(check-po)
-       $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po $(rootdir)/po/home.$(1).po --localized $(rootdir)/po/home.$(1).m4
+       POFILE=$(rootdir)/po/home.$(1).po M4FILE=$(rootdir)/po/home.$(1).m4 ; \
+         $(generate-html)
        $(SED) --in-place 
"s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
        $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" 
$(rootdir)/po/home.$(1).m4
        $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $(rootdir)/po/home.$(1).m4
@@ -285,7 +291,7 @@
                           $(1).po generic.$(2).html
        $$(addfile)
        PO=$(1).po ; $(check-po)
-       $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po $(1).po --localized $(1).m4
+       POFILE=$(1).po M4FILE=$(1).m4 ; $(generate-html)
        $(SED) --in-place 
"s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1).m4
        $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" $(1).m4
        $(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[ 
\t]*\)\{3,\}<!--/\n\n<!--/g' $(1).m4