trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /cvsroot/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/03/18 06:15:14

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        (update-po): New variable, containing canned command sequence to
        update a PO file.  All callers changed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- ChangeLog   18 Mar 2008 06:02:40 -0000      1.52
+++ ChangeLog   18 Mar 2008 06:15:14 -0000      1.53
@@ -3,6 +3,8 @@
        * GNUmakefile (PO4A_XHTMLFLAGS): Rename to...
        (PO4A-XHTMLFLAGS): ....for consistency with the other variables.
        All uses changed.
+       (update-po): New variable, containing canned command sequence to
+       update a PO file.  All callers changed.
 
 2008-03-16  Yavor Doganov  <address@hidden>
 

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- GNUmakefile 18 Mar 2008 06:02:41 -0000      1.23
+++ GNUmakefile 18 Mar 2008 06:15:14 -0000      1.24
@@ -151,6 +151,13 @@
   $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $$$$PO
 endef
 
+# The command to update a PO file from the POT.  The target is
+# `touched' in order `make' to consider it up-to-date even if there
+# is nothing to merge.
+define update-po
+$(MSGMERGE) --update $$@ $$< && touch $$@
+endef
+
 # The command to mail errors from make-prototype.
 define mail-error-proto
 ./mailfail $(NOTIFYSKIP) $(web-addr),$(devel-addr) \
@@ -194,8 +201,7 @@
 # an old version of gettext.  The XHTML validation errors should be
 # clear even if the bug is in the server templates translations.
        -PO=$$@ ; $(check-po)
-       @echo Updating PO file...
-       $(MSGMERGE) --update $$@ $$< && touch $$@
+       $(update-po)
 
 $(template-dir)/%.$(1).html: $(template-dir)/%.html \
                             $(template-dir)/po/%.$(1).po
@@ -230,8 +236,7 @@
 define home-rules
 $(rootdir)/po/home.$(1).po: $(rootdir)/po/home.pot
        PO=$$@ ; $(check-po)
-       $(MSGMERGE) --update $$@ $$<
-       touch $$@
+       $(update-po)
 
 $(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto \
                            $(rootdir)/po/home.$(1).po generic.$(1).html
@@ -298,8 +303,7 @@
 define article-rules
 $(1).po: $(basename $(1)).pot
        PO=$$@ ; $(check-po)
-       $(MSGMERGE) --update $$@ $$<
-       touch $$@
+       $(update-po)
 
 $(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks \
                           $(1).po generic.$(2).html