trans-coord/gnun/server/gnun GNUmakefile.team

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/12/06 16:25:48

Modified files:
        gnun/server/gnun: GNUmakefile.team 

Log message:
        (sync-file) <sync-$(1)>: Fix the case when some message sets in PO files
        are empty.  Make output of statistics more consistent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.18&r2=1.19

Patches:
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- GNUmakefile.team    6 Dec 2012 12:28:51 -0000       1.18
+++ GNUmakefile.team    6 Dec 2012 16:25:48 -0000       1.19
@@ -175,18 +175,20 @@
                     echo -n "$$$${file#./}: Merging"; \
                     $(MSGATTRIB) --no-fuzzy -o $(1)-tmp.www.po $$$$www_po  
2>&1; \
                     $(MSGATTRIB) --fuzzy -o $(1)-tmp.po $1  2>&1; \
-                    $(MSGCAT) --use-first --more-than=1 -o $(1)-tmp.po \
-                               $(1)-tmp.www.po $(1)-tmp.po 2>&1; \
-                    $(MSGCAT) --use-first --less-than=2 -o $(1) $(1)-tmp.po 
$(1); \
+                    test -s $(1)-tmp.po && test -s $(1)-tmp.www.po && \
+                    $(MSGCAT) --use-first --more-than=1 \
+                       $(1)-tmp.www.po $(1)-tmp.po 2>&1 \
+                    | $(MSGCAT) --use-first --less-than=2 -o $(1) - $(1); \
                     $(MSGMERGE) $(MSGMERGEFLAGS) $(MSGMERGEVERBOSE) -C 
$$$${www_po} \
                       --update $1 $$$${www_po%.$(TEAM).po}.pot 2>&1; \
-                    echo -n "   "; $(MSGFMT) -o /dev/null --statistics $1; \
+                    echo "   " `$(MSGFMT) -o /dev/null --statistics $1 2>&1`; \
                     $(RM) $(1)-tmp.www.po $(1)-tmp.po; \
                   } \
            else \
              echo -n "$$$${file#./}: Merging new translation"; \
              $(MSGMERGE) $(MSGMERGEFLAGS) $(MSGMERGEVERBOSE) \
                 --update $1 $$$${www_po%.$(TEAM).po}.pot 2>&1; \
+             echo "   " `$(MSGFMT) -o /dev/null --statistics $1 2>&1`; \
            fi; \
          fi
 sync: sync-$(1)