import texinfo 4.8 into the tree.

(okay theo, kettenis)

2 files changed, 6 insertions, 3 deletions

diff --git a/gnu/usr.bin/texinfo/djgpp/config.bat b/gnu/usr.bin/texinfo/djgpp/config.bat
index c9ca7d55287..3b000ee6dc2 100644
--- a/gnu/usr.bin/texinfo/djgpp/config.bat
+++ b/gnu/usr.bin/texinfo/djgpp/config.bat
@@ -206,6 +206,9 @@ echo Running the ./configure script...
 sh ./configure @arguments

 if errorlevel 1 goto cfg_error

 rm arguments

+

+Rem Remove files created by the gl_FUNC_MKSTEMP test.

+rm co*.tmp

 echo Done.

 goto End

 

diff --git a/gnu/usr.bin/texinfo/djgpp/config.sed b/gnu/usr.bin/texinfo/djgpp/config.sed
index abc6b6f0d3c..c4193df0fbd 100644
--- a/gnu/usr.bin/texinfo/djgpp/config.sed
+++ b/gnu/usr.bin/texinfo/djgpp/config.sed
@@ -22,7 +22,7 @@
   }
 
 # Makefile.in.in is renamed to Makefile.in-in.
-/^ac_config_files=/,/_ACEOF/ {
+/ac_config_files=/,/_ACEOF/ {
   s|po/Makefile\.in|&:po/Makefile.in-in|
 }
 /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
@@ -51,10 +51,10 @@ s,\.deps,_deps,g
 # the package has not been configured for.
 /MISSING=/,/^$/ {
   /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
 }
 /^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
 
 # The following makes sure we are not going to remove a directory
 # which is the cwd on its drive (DOS doesn't allow to remove such