[groff] 01/01: Fix previous commit.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit c8b0c254fe919c24acf996c4ded666a59d155abe
Author: Werner Lemberg <address@hidden>
Date:   Sun Mar 16 07:08:38 2014 +0100

    Fix previous commit.
    
    Problem reported (with a patch) by Ingo Schwarze
    <address@hidden>.
    
    * doc/Makefile.sub (groff_bin_dirs): Add `preconv'.
    
    * doc/Makefile.in (groff_bin_dirs): Add `preconv'.
    (.me.txt): Call preconv.  Use UTF8 as output encoding.
    (.me.ps): Call preconv.
---
 ChangeLog        |   13 +++++++++++++
 doc/Makefile.in  |    9 +++++----
 doc/Makefile.sub |    1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b3467f..3c99bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-03-16  Werner Lemberg  <address@hidden>
+
+       Fix previous commit.
+
+       Problem reported (with a patch) by Ingo Schwarze
+       <address@hidden>.
+
+       * doc/Makefile.sub (groff_bin_dirs): Add `preconv'.
+
+       * doc/Makefile.in (groff_bin_dirs): Add `preconv'.
+       (.me.txt): Call preconv.  Use UTF8 as output encoding.
+       (.me.ps): Call preconv.
+
 2014-03-14  Werner Lemberg  <address@hidden>
 
        [me] Add translation of `meintro.me' to French.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 44c133a..15087de 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2007, 2009-2011
+# Copyright (C) 2002-2007, 2009-2011, 2014
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg <address@hidden>
 # 
@@ -50,6 +50,7 @@ TEXI2DVI=texi2dvi
 groff_bin_dirs=\
   $(top_builddir)/src/roff/groff \
   $(top_builddir)/src/roff/troff \
+  $(top_builddir)/src/preproc/preconv \
   $(top_builddir)/src/preproc/pic \
   $(top_builddir)/src/preproc/eqn \
   $(top_builddir)/src/preproc/tbl \
@@ -84,11 +85,11 @@ imagedir=img
 .SUFFIXES: .me .ms .ps .html .txt .texinfo .dvi .pdf .xhtml
 .PHONY: all prepare_examples clean distclean realclean extraclean
 
-# For simplicity, we always call grn and eqn.
+# For simplicity, we always call preconv, grn, and eqn.
 .me.txt:
-       $(GROFF) -Tascii -ge -me >$@
+       $(GROFF) -k -Tutf8 -ge -me >$@
 .me.ps:
-       $(GROFF) -Tps -ge -me >$@
+       $(GROFF) -k -Tps -ge -me >$@
 
 .ms.html:
        $(GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index e6df86b..913b262 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -24,6 +24,7 @@ GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's|  
*|$(SH_SEP)|g'`
 groff_bin_dirs=\
   $(top_builddir)/src/roff/groff \
   $(top_builddir)/src/roff/troff \
+  $(top_builddir)/src/preproc/preconv \
   $(top_builddir)/src/preproc/pic \
   $(top_builddir)/src/preproc/eqn \
   $(top_builddir)/src/preproc/tbl \