trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       11/09/08 16:31:50

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        (mark-outdated): Out-of-date notice is placed after every line 
beginning with
        "<!--GNUN: OUT-OF-DATE NOTICE-->" or after /server/banner include 
directive
        if no such lines are found.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- ChangeLog   4 Sep 2011 12:06:28 -0000       1.197
+++ ChangeLog   8 Sep 2011 16:31:50 -0000       1.198
@@ -1,3 +1,10 @@
+2011-09-08  Pavel Kharitonov  <address@hidden>
+       
+       * GNUmakefile (mark-outdated): Out-of-date notice
+       is placed after every line beginning with
+       "<!--GNUN: OUT-OF-DATE NOTICE-->" or after /server/banner
+       include directive if no such lines are found.
+
 2011-09-04  Pavel Kharitonov  <address@hidden>
 
        Fix previous commit.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- GNUmakefile 4 Sep 2011 12:06:28 -0000       1.87
+++ GNUmakefile 8 Sep 2011 16:31:50 -0000       1.88
@@ -183,17 +183,25 @@
 endef
 
 # Add notice about the translation being out of date.
+# The notice is inserted after every line beginning with
+# "<!--GNUN: OUT-OF-DATE NOTICE-->"
+# If no such lines are found in the file, the notice
+# is inserted after <!--#include virtual="/server/banner"-->.
 # Limitation: it doesn't notice that GRACE is expired
 # unless the POT file is updated at least once after
 # the HTML file is marked outdated. In practice this doesn't
 # matter since GRACE value is very high.
 define mark-outdated
-$(SED) --in-place "/^<"'!'"--#set var=\"PO_FILE\"/,+3d;\
-/^<"'!'"--#include virtual=\"\/server\/banner/a\
-<"'!'"--#set var=\"PO_FILE\"\n \
-    value='<a href=\"http://www.gnu.org$$$${PO#$(rootdir)}\">\n\
-           http://www.gnu.org$$$${PO#$(rootdir)}</a>' -->\n\
-<"'!'"--#include virtual=\"/server/outdated.$(2).html\" -->" $(1) \
+marker='GNUN: OUT-OF-DATE NOTICE'; \
+$(GREP) -q '^<!--'"$$$${marker}-->" $(1) \
+ || marker='#include virtual="\/server\/banner'; \
+$(SED) --in-place \
+'/^<!--#set var="PO_FILE"/,/<!--#include virtual="\/server\/outdated/d;\
+ /^<!--'"$$$${marker}"'/a\
+  <!--#set var="PO_FILE"\n \
+    value='"'<a href=\"http://www.gnu.org$$$${PO#$(rootdir)}\">\n\
+           http://www.gnu.org$$$${PO#$(rootdir)}</a>'"' -->\n\
+<!--#include virtual="/server/outdated.$(2).html" -->' $(1) \
  || true
 endef