trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/05/29 10:11:47

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        (update-po): Substitute default values in a more robust way.
          Add the fields when they are missing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.268&r2=1.269
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.125&r2=1.126

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -b -r1.268 -r1.269
--- ChangeLog   27 Apr 2012 05:16:22 -0000      1.268
+++ ChangeLog   29 May 2012 10:11:46 -0000      1.269
@@ -1,3 +1,8 @@
+2012-05-29  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (update-po): Substitute default values in a more
+       robust way.  Add the fields when they are missing.
+
 2012-04-27  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (mark-outdated): Fix `add-file' call.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- GNUmakefile 27 Apr 2012 05:16:22 -0000      1.125
+++ GNUmakefile 29 May 2012 10:11:47 -0000      1.126
@@ -564,16 +564,26 @@
 # The target is `touched' in order to make `make' to consider it
 # up-to-date even if there is nothing to merge.  The default values of
 # Content-Type and Content-Transfer-Encoding are replaced with commonly
-# used values.  When appropriate, $(ADD-FUZZY-DIFF) is invoked.
+# used values (or added if the fields are absent).  When appropriate,
+# $(ADD-FUZZY-DIFF) is invoked.
 #
-# When compendia/master-translated.$(3).po present, its translations override
+# When compendia/master-translated.$(3).po is present, its translations 
override
 # the translations from $(1); when compendia/fuzzy-compendium.$(3).po is
 # present, it is checked for missing translations.
 define update-po
 $(SED) \
-  '1,/^$$$$/ { \
-     address@hidden("Content-Type: text/plain; 
charset\)=CHARSET\\n"@\1=UTF-8\\n"@; \
-     s/^\("Content-Transfer-Encoding:\) ENCODING\\n"/\1 8bit\\n"/; \
+  '1{ \
+      :egin; /\nmsgstr /b msgstr; N; begin; \
+      :msgstr; N; /\nmsgstr .*\n\n/b process; b msgstr; \
+      :process; \
+      address@hidden(\nmsgstr.*\n"Content-Type: text/plain; 
charset\)=CHARSET\\n"address@hidden
+\1=UTF-8\\n"\n@; \
+      /\nmsgstr .*\n"Content-Type:/! \
+        address@hidden(\nmsgstr .*\n\)address@hidden"Content-Type: text/plain; 
charset=UTF-8\\n"\n\n@; \
+      s/\(\n"Content-Transfer-Encoding:\) ENCODING\\n"\n/\1 8bit\\n"\n/; \
+      /\nmsgstr .*\n"Content-Transfer-Encoding:/! \
+       s/\(\nmsgstr .*\n\)\n/\1"Content-Transfer-Encoding: 8bit\\n"\n\n/; \
+       p; d; \
    }' $(1) \
   $(if $(MASTER-$(3)), \
      | $(MSGATTRIB) --clear-obsolete \