diff -urk.orig texinfo-4.8.orig/util/texi2dvi texinfo-4.8/util/texi2dvi
--- texinfo-4.8.orig/util/texi2dvi	2004-12-31 21:03:05 +0300
+++ texinfo-4.8/util/texi2dvi	2005-01-04 18:56:25 +0300
@@ -90,7 +90,7 @@
 oformat=dvi
 oname=          # --output
 quiet=          # by default let the tools' message be displayed
-recode=false
+recode=
 set_language=
 textra=         # Extra TeX commands to insert in the input file.
 textra_cmd=     # sed command to insert TEXTRA where appropriate
@@ -191,7 +191,7 @@
       esac;;
     -p | --p*) oformat=pdf;;
     -q | -s | --q* | --s*) quiet=t; batch=true;;
-    -r | --r*) recode=true;;
+    -r | --r*) recode=recode;;
     -t | --tex* | --com* ) shift; textra="$textra\\
 "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
     -v | --vers*) echo "$version"; exit 0;;
@@ -611,9 +611,9 @@
 	:found                                               
 	q'
     encoding=`sed -e "$pgm" "$filename_input"`
-    if $recode && test -n "$encoding" && findprog recode; then
+    if test -n "$recode" && test -n "$encoding" && findprog "$recode"; then
       $verbose "Recoding from $encoding to Texinfo."
-      if recode "$encoding"..texinfo <"$filename_input" >"$filename_rcd" \
+      if "$recode" "$encoding"..texinfo <"$filename_input" >"$filename_rcd" \
          && test -s "$filename_rcd"; then
         filename_input=$filename_rcd
       else