texinfo/texi2html ChangeLog Makefile.am Makefil...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/07/17 22:51:50

Modified files:
        texi2html      : ChangeLog Makefile.am Makefile.in 

Log message:
                * Makefile.am: modify on the fly $(PACKAGE)_document.pot to set
                the charset to ascii and not CHARSET since msgexec doesn't like
                this anymore.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/ChangeLog?cvsroot=texinfo&r1=1.522&r2=1.523
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.in?cvsroot=texinfo&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/ChangeLog,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -b -r1.522 -r1.523
--- ChangeLog   17 Jul 2010 11:08:41 -0000      1.522
+++ ChangeLog   17 Jul 2010 22:51:48 -0000      1.523
@@ -1,3 +1,9 @@
+2010-07-18  Patrice Dumas  <address@hidden>
+
+       * Makefile.am: modify on the fly $(PACKAGE)_document.pot to set
+       the charset to ascii and not CHARSET since msgexec doesn't like
+       this anymore.
+
 2010-07-17  Patrice Dumas  <address@hidden>
 
        * texi2html.pl: accept --set-init-var VAR=VALUE syntax. Karl

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- Makefile.am 15 Jul 2010 15:20:38 -0000      1.72
+++ Makefile.am 17 Jul 2010 22:51:50 -0000      1.73
@@ -198,6 +198,12 @@
          cd $(po_document_dir)/po_document && $(MAKE) $(AM_MAKEFLAGS) 
update-po; \
        fi
 
+# notice the 
+#     cat $< | sed -e 's/charset=CHARSET/charset=ascii/'
+# Indeed $(po_document_dir)/po_document/$(PACKAGE)_document.pot is 
+# autogenerated with charset CHARSET (and no command line option for 
+# xgettext to change it), and msgexec doesn't like it and don't do anything.
+# msgexec: present charset "CHARSET" is not a portable encoding name
 i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
        $(MKDIR_P) i18n
        if test '$(USE_NLS)' = 'yes'; then \
@@ -205,7 +211,7 @@
                test "$$lang" = 'en' && continue; \
                msgexec -i "$$file" "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" $$lang > i18n/$$lang.thl; \
          done; \
-         msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
+         cat $< | sed -e 's/charset=CHARSET/charset=ascii/' | msgexec 
"$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > 
i18n/en.thl; \
        else \
          cp -p i18n_ref/*.thl i18n; \
        fi

Index: Makefile.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- Makefile.in 15 Jul 2010 15:20:40 -0000      1.102
+++ Makefile.in 17 Jul 2010 22:51:50 -0000      1.103
@@ -1362,6 +1362,12 @@
          cd $(po_document_dir)/po_document && $(MAKE) $(AM_MAKEFLAGS) 
update-po; \
        fi
 
+# notice the 
+#     cat $< | sed -e 's/charset=CHARSET/charset=ascii/'
+# Indeed $(po_document_dir)/po_document/$(PACKAGE)_document.pot is 
+# autogenerated with charset CHARSET (and no command line option for 
+# xgettext to change it), and msgexec doesn't like it and don't do anything.
+# msgexec: present charset "CHARSET" is not a portable encoding name
 i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
        $(MKDIR_P) i18n
        if test '$(USE_NLS)' = 'yes'; then \
@@ -1369,7 +1375,7 @@
                test "$$lang" = 'en' && continue; \
                msgexec -i "$$file" "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" $$lang > i18n/$$lang.thl; \
          done; \
-         msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
+         cat $< | sed -e 's/charset=CHARSET/charset=ascii/' | msgexec 
"$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > 
i18n/en.thl; \
        else \
          cp -p i18n_ref/*.thl i18n; \
        fi