Re: #include directives as strings

[Kaloian Doganov]

Yavor Doganov <address@hidden> writes:

    Your workaround includes changes in make-prototype, right?

No, just in GNUmakefile.

Index: server/gnun/GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.10
diff -u -r1.10 GNUmakefile
--- server/gnun/GNUmakefile     10 Mar 2008 18:42:43 -0000      1.10
+++ server/gnun/GNUmakefile     11 Mar 2008 10:48:45 -0000
@@ -208,6 +208,9 @@
        $(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$< \
          --generic=generic.html --output=$@ || ($(RM) $@ ; exit 1)
        $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+# Temporary escape of <!--#include --> directives, in order to
+# workaround a bug introduced in Po4a 0.33.
+       $(SED) --in-place 's/<!--\#include .*-->/<gnun>\0<\/gnun>/g' $@
 
 $(rootdir)/po/home.pot: $(rootdir)/po/home.proto
        $(addfile)
@@ -260,6 +263,9 @@
          --translinks=$(1).translinks \
            || ($(RM) $(1).proto $(1).translinks ; exit 1)
        $(SED) --in-place "s/\$$$$Date.*\$$$$/<gnun>\0<\/gnun>/g" $(1).proto
+# Temporary escape of <!--#include --> directives, in order to
+# workaround a bug introduced in Po4a 0.33.
+       $(SED) --in-place 's/<!--\#include .*-->/<gnun>\0<\/gnun>/g' $(1).proto
 
 $(1).pot: $(1).proto
        $$(addfile)
Index: server/gnun/ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.27
diff -u -r1.27 ChangeLog
--- server/gnun/ChangeLog       10 Mar 2008 18:42:43 -0000      1.27
+++ server/gnun/ChangeLog       11 Mar 2008 10:48:46 -0000
@@ -1,3 +1,9 @@
+2008-03-11  Kaloian Doganov  <address@hidden>
+
+       * GNUmakefile ($(rootdir)/po/home.proto)
+       ($(1).proto $(1).translinks) Temporary escape of <!--#include -->
+       directives, in order to workaround a bug introduced in Po4a 0.33.
+
 2008-03-10  Kaloian Doganov  <address@hidden>
 
        * GNUmakefile (PO4A_XHTMLFLAGS): Migrate to the new