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 08:52:08

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        (check-po): Use a temporary variable PO, defined for
        each sub-shell invocation.
        ($(template_dir)/po/%.$(1).po): Prepend and define the PO variable.
        ($(rootdir)/po/home.$(1).po, $(1).po): Likewise.
        ($(template_dir)/%.$(1).html, $(rootdir)/home.$(1).shtml)
        ($(subst /po/,/,$(1).html)): Run $(check-po) to validate PO files,
        defining the PO variable accordingly.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- ChangeLog   13 Mar 2008 06:52:54 -0000      1.31
+++ ChangeLog   13 Mar 2008 08:52:08 -0000      1.32
@@ -1,5 +1,13 @@
 2008-03-13  Yavor Doganov  <address@hidden>
 
+       * GNUmakefile (check-po): Use a temporary variable PO, defined for
+       each sub-shell invocation.
+       ($(template_dir)/po/%.$(1).po): Prepend and define the PO variable.
+       ($(rootdir)/po/home.$(1).po, $(1).po): Likewise.
+       ($(template_dir)/%.$(1).html, $(rootdir)/home.$(1).shtml)
+       ($(subst /po/,/,$(1).html)): Run $(check-po) to validate PO files,
+       defining the PO variable accordingly.
+
        * gnun.mk: Doc fix.
 
 2008-03-11  Yavor Doganov  <address@hidden>

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- GNUmakefile 11 Mar 2008 14:58:19 -0000      1.14
+++ GNUmakefile 13 Mar 2008 08:52:08 -0000      1.15
@@ -139,8 +139,8 @@
 # The command to check the validity of a PO file.
 define check-po
 ./mailfail $(NOTIFYSKIP) $(transl_addr) \
-  "[GNUN Error] $$(subst $$(rootdir)/,,$$@) is not a valid PO file" \
-  $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $$@
+  "[GNUN Error] $$$${PO#../../} is not a valid PO file" \
+  $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $$$$PO
 endef
 
 # The command to mail errors from make-prototype.
@@ -185,12 +185,13 @@
 # it is OK to ignore errors from these, at least until fencepost has
 # an old version of gettext.  The XHTML validation errors should be
 # clear even if the bug is in the server templates translations.
-       -$(check-po)
+       -PO=$$@ ; $(check-po)
        @echo Updating PO file...
        $(MSGMERGE) --update $$@ $$< && touch $$@
 
 $(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 $$@
@@ -220,12 +221,14 @@
 
 define home_rules
 $(rootdir)/po/home.$(1).po: $(rootdir)/po/home.pot
-       $(check-po)
+       PO=$$@ ; $(check-po)
        $(MSGMERGE) --update $$@ $$<
        touch $$@
 
-$(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto 
$(rootdir)/po/home.$(1).po generic.$(1).html
+$(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto \
+                           $(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
        $(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
@@ -274,12 +277,14 @@
 
 define article_rules
 $(1).po: $(basename $(1)).pot
-       $(check-po)
+       PO=$$@ ; $(check-po)
        $(MSGMERGE) --update $$@ $$<
        touch $$@
 
-$(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks 
$(1).po generic.$(2).html
+$(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks \
+                          $(1).po generic.$(2).html
        $$(addfile)
+       PO=$(1).po ; $(check-po)
        $(PO4A-TRANSLATE) $(PO4A_XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master 
$$< --po $(1).po --localized $(1).m4
        $(SED) --in-place 
"s/\(<gnun>include(\`.*\)\([.]html')<\/gnun>\)/\1.$(2)\2/g" $(1).m4
        $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" $(1).m4