trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/03/12 05:42:20

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        (localized-includes): Write down full paths to templates;
           add server/html5-header and server/html5-head-include.
        (substitute-localized-includes): Only substitute when full path matches.
        (rules for extra templates): Make it work for templates from topmost
           directory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.256&r2=1.257

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- GNUmakefile 7 Mar 2012 18:23:32 -0000       1.115
+++ GNUmakefile 12 Mar 2012 05:42:19 -0000      1.116
@@ -86,15 +86,18 @@
 
 # FIXME: footer-short and footer-min are remnants from the old-new
 # design; they should go at some point.
-localized-includes := header head-include-1 head-include-2 banner \
-                     body-include-1 body-include-2 footer \
-                     footer-short footer-min $(extra-templates)
+localized-includes := server/header server/head-include-1 \
+                     server/head-include-2 server/banner \
+                     server/html5-header server/html5-head-include-1 \
+                     server/body-include-1 server/body-include-2 \
+                     server/footer server/footer-short server/footer-min \
+                     $(extra-templates)
 
 # Issue a command to substitute localized includes in a HTML file.
 # Usage: $(call substitute-localized-includes,$(lang)) file.$(lang).html
 define substitute-localized-includes
 $(SED) --in-place $(foreach inc, $(localized-includes), \
-  -e 's%\(<!--#include virtual=\".*$(inc)\)\(.html\" -->\)%\1.$(1)\2%g')
+  -e 's%\(<!--#include virtual=\"/$(inc)\)\(.html\" -->\)%\1.$(1)\2%g')
 endef
 
 ### Special variables for the `www' master templates ###
@@ -602,7 +605,8 @@
 $(foreach template, $(extra-templates),\
   $(eval $(call extra-template-rules, \
           $(addprefix $(rootdir)/, \
-            $(dir $(template)))po/$(notdir $(template)))))
+           $(if $(findstring $(dir $(template)),./),,\
+             $(dir $(template)))po/$(notdir $(template))))))
 
 ### End of rules for extra templates ###
 

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- ChangeLog   11 Mar 2012 15:50:39 -0000      1.256
+++ ChangeLog   12 Mar 2012 05:42:20 -0000      1.257
@@ -1,3 +1,13 @@
+2012-03-12  Pavel Kharitonov  <address@hidden>
+
+       * GNUMakefile (localized-includes): Write down full paths
+       to templates; add server/html5-header and
+       server/html5-head-include.
+       (substitute-localized-includes): Only substitute when full path
+       matches.
+       (rules for extra templates): Make it work for templates from
+       topmost directory.
+
 2012-03-11  Pavel Kharitonov  <address@hidden>
 
        * doc/gnun.texi (Main Variables): Fix the list of includes.