diff -apruNU3 texinfo-4.8.orig/djgpp/config.bat texinfo-4.8/djgpp/config.bat
--- texinfo-4.8.orig/djgpp/config.bat	2004-12-17 22:47:54.000000000 +0000
+++ texinfo-4.8/djgpp/config.bat	2005-01-29 00:54:30.000000000 +0000
@@ -105,6 +105,12 @@ set CONFIG_SITE=%XSRC%/djgpp/config.site
 if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto small_env
 
 Rem Make sure crucial file names are not munged by unpacking
+test -f %XSRC%/m4/inttypes-pri.m4
+if not errorlevel 1 mv -f %XSRC%/m4/inttypes-pri.m4 %XSRC%/m4/inttype-pri.m4
+test -f %XSRC%/m4/inttypes_h.m4
+if not errorlevel 1 mv -f %XSRC%/m4/inttypes_h.m4 %XSRC%/m4/inttype_h.m4
+test -f %XSRC%/m4/onceonly_2_57.m4
+if not errorlevel 1 mv -f %XSRC%/m4/onceonly_2_57.m4 %XSRC%/m4/2_57_onceonly.m4
 test -f %XSRC%/po/Makefile.in.in
 if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
 test -f %XSRC%/po/Makefile.am.in
@@ -230,6 +236,7 @@ if not errorlevel 1 goto no_ren1
 test -f %XSRC%/install-sh
 if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
 :no_ren1
+redir -e /dev/null rm ./co*.tmp
 if "%HOME%" == "%XSRC%/djgpp" set HOME=
 set ARGS=
 set CONFIG_SITE=
diff -apruNU3 texinfo-4.8.orig/djgpp/config.sed texinfo-4.8/djgpp/config.sed
--- texinfo-4.8.orig/djgpp/config.sed	2004-12-15 14:59:22.000000000 +0000
+++ texinfo-4.8/djgpp/config.sed	2005-01-29 00:54:30.000000000 +0000
@@ -12,14 +12,17 @@
   s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
   s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
   /^install-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
+    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i,\
     s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
     s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
   }\
   /^uninstall-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
+    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i,\
     s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
-  }
+  }\
+  s,inttypes-pri\\.m4,inttype-pri.m4,\
+  s,inttypes_h\\.m4,inttype_h.m4,\
+  s,onceonly_2_57\\.m4,2_57_onceonly.m4,
 
 # Makefile.in.in is renamed to Makefile.in-in.
 /ac_config_files=/,/_ACEOF/ {
diff -apruNU3 texinfo-4.8.orig/djgpp/config.site texinfo-4.8/djgpp/config.site
--- texinfo-4.8.orig/djgpp/config.site	2002-09-26 22:01:10.000000000 +0000
+++ texinfo-4.8/djgpp/config.site	2005-01-29 00:54:30.000000000 +0000
@@ -43,6 +43,7 @@ ac_cv_prog_CC=${CC='gcc'}
 NM=${NM='nm'}
 LD=${LD='ld'}
 MAKEINFO=${MAKEINFO='makeinfo'}
+HELP2MAN=${HELP2MAN='/dev/env/DJDIR/bin/perl /dev/env/DJDIR/bin/help2man'}
 
 # Force the test for 'ln -s' to report 'cp -pf'.
 ac_cv_prog_LN_S='cp -pf'
