some patches

[lb]

i wrote 3 patches for texinfo 4.2

1. change mktemp on mkstemp due to gcc-3.1 assumes usage of mktemp as error
2. ospeed variable conflicts with ncurces from ASP Linux
3. when creating $infopath/dir there's no comma after node name, so info 
can't find top node

lb

diff -Nru old/util/texindex.c new/util/texindex.c
--- old/util/texindex.c Mon Mar 11 22:55:46 2002
+++ new/util/texindex.c Wed Jul 10 13:14:00 2002
@@ -37,7 +37,6 @@
 #define memset(ptr, ignore, count) bzero (ptr, count)
 #endif
 
-char *mktemp ();
 
 #if !defined (SEEK_SET)
 #  define SEEK_SET 0
@@ -181,7 +180,7 @@
 
   decode_command (argc, argv);
 
-  tempbase = mktemp (concat ("txiXXXXXX", "", ""));
+  tempbase = mkstemp (concat ("txiXXXXXX", "", ""));
 
   /* Process input files completely, one by one.  */
 

diff -Nru old/info/terminal.c new/info/terminal.c
--- old/info/terminal.c Sat Nov 17 02:16:04 2001
+++ new/info/terminal.c Sun Jun 23 20:12:16 2002
@@ -41,7 +41,7 @@
 /* Termcap requires these variables, whether we access them or not. */
 char *BC, *UP;
 char PC;      /* Pad character */
-short ospeed; /* Terminal output baud rate */
+short ospd; /* Terminal output baud rate */
 extern int tgetnum (), tgetflag (), tgetent ();
 extern char *tgetstr (), *tgoto ();
 extern void tputs ();
@@ -571,9 +571,9 @@
   {
     struct termios ti;
     if (tcgetattr (fileno(stdout), &ti) != -1)
-      ospeed = cfgetospeed (&ti);
+      ospd = cfgetospeed (&ti);
     else
-      ospeed = B9600;
+      ospd = B9600;
   }
 #else
 # if defined (TIOCGETP)
@@ -581,12 +581,12 @@
     struct sgttyb sg;
 
     if (ioctl (fileno (stdout), TIOCGETP, &sg) != -1)
-      ospeed = sg.sg_ospeed;
+      ospd = sg.sg_ospeed;
     else
-      ospeed = B9600;
+      ospd = B9600;
   }
 # else
-  ospeed = B9600;
+  ospd = B9600;
 # endif /* !TIOCGETP */
 #endif
 

diff -Nru old/util/install-info.c new/util/install-info.c
--- old/util/install-info.c     Mon Mar 11 22:55:23 2002
+++ new/util/install-info.c     Thu Jul 11 15:35:02 2002
@@ -456,7 +456,7 @@
   to select it.\n\
 \n\
 * Menu:\n\
-"), "File: dir,\tNode: Top"); /* This part must not be translated.  */
+"), "File: dir,\tNode: Top,"); /* This part must not be translated.  */
           if (fclose (f) < 0)
             pfatal_with_name (dirfile);
         }