* Makefile.in (install, install-info, installdirs, uninstall): Make

        these phony targets.
So we don't overwrite a newer version of texinfo that might already be
installed on the system.

        * makeinfo/makeinfo.c: Maybe include <stdlib.h> for malloc et al.
        * util/install-info.c: Include <string*.h>.
        (my_strerror): Use strerror if available.
Avoids alpha bug and redecl of sys_errlist problems.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@15051 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index aea2b38..d12ca23 100644 (file)
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -1,3 +1,14 @@
+Tue Sep  2 22:25:34 1997  Jeffrey A Law  (law@cygnus.com)
+
+       * Makefile.in (install, install-info, installdirs, uninstall): Make
+       these phony targets.
+
+Tue Sep  2 10:19:48 1997  Richard Henderson  <rth@cygnus.com>
+
+       * makeinfo/makeinfo.c: Maybe include <stdlib.h> for malloc et al.
+       * util/install-info.c: Include <string*.h>.
+       (my_strerror): Use strerror if available.
+
 Tue Aug 26 11:18:52 1997  Jeffrey A Law  (law@cygnus.com)
 
        * libtxi/Makefile.in: Add dependencies for memcpy, memmove and strdup.

diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in
index 4a50838..0539b9b 100644 (file)
--- a/texinfo/Makefile.in
+++ b/texinfo/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for Texinfo distribution.
-# $Id: Makefile.in,v 1.11 1996/10/04 18:40:33 karl Exp $
+# $Id: Makefile.in,v 1.1.1.1 1997/08/21 22:57:51 jason Exp $
 # 
 # Copyright (C) 1993, 96 Free Software Foundation, Inc.
 
@@ -87,40 +87,7 @@ installcheck:
 dvi: texinfo.dvi license.dvi lgpl.dvi
        @for dir in $(SUBDIRS); do cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@; cd ..; done
 
-install: all installdirs
-       test -f $(infodir)/dir || $(INSTALL_DATA) $(srcdir)/dir $(infodir)  
-       for dir in $(SUBDIRS); do \
-          echo making $@ in $$dir; \
-          (cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \
-       done
-       d=$(srcdir); test -f ./texinfo && d=.; \
-       (cd $$d && for f in texinfo* ; do \
-           $(INSTALL_DATA) $$f $(infodir)/$$f; done)
-       $(POST_INSTALL)
-       ./util/install-info --info-dir=$(infodir) $(infodir)/texinfo
-       @echo Please install $(srcdir)/texinfo.tex manually.
-
-installdirs:
-       -$(SHELL) $(srcdir)/util/mkinstalldirs $(bindir) $(datadir) $(infodir) $(mandir)
-
-.PHONY: install-info
-install-info: info
-       for dir in $(SUBDIRS); do \
-          echo making $@ in $$dir; \
-          (cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \
-       done
-       d=$(srcdir); test -f ./texinfo && d=.; \
-       (cd $$d; \
-         for f in texinfo* ; do \
-           $(INSTALL_DATA) $$f $(infodir)/$$f; \
-         done)
-
-uninstall:
-       for dir in $(SUBDIRS); do \
-         echo making $@ in $$dir; \
-         (cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \
-       done
-       $(RM) $(infodir)/texinfo $(infodir)/texinfo-*
+.PHONY: install installdirs installcheck install-info uninstall
 
 Makefile: Makefile.in config.status
        $(SHELL) ./config.status

diff --git a/texinfo/makeinfo/makeinfo.c b/texinfo/makeinfo/makeinfo.c
index ee12ef2..fddc6d9 100644 (file)
--- a/texinfo/makeinfo/makeinfo.c
+++ b/texinfo/makeinfo/makeinfo.c
@@ -1,5 +1,5 @@
 /* Makeinfo -- convert texinfo format files into info files.
-   $Id: makeinfo.c,v 1.37 1996/10/04 18:20:52 karl Exp $
+   $Id: makeinfo.c,v 1.1.1.1 1997/08/21 22:58:07 jason Exp $
 
    Copyright (C) 1987, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 
@@ -79,6 +79,10 @@ int minor_version = 67;
 #include <perror.h>
 #endif
 
+#if defined (STDC_HEADERS)
+#include <stdlib.h>
+#endif
+
 #if defined (HAVE_STRING_H)
 #include <string.h>
 #else

diff --git a/texinfo/util/install-info.c b/texinfo/util/install-info.c
index 53fa4aa..6e5fc90 100644 (file)
--- a/texinfo/util/install-info.c
+++ b/texinfo/util/install-info.c
@@ -1,7 +1,7 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
    Copyright (C) 1996 Free Software Foundation, Inc.
 
-$Id: install-info.c,v 1.12 1996/10/03 23:13:36 karl Exp $
+$Id: install-info.c,v 1.1.1.1 1997/08/21 22:58:12 jason Exp $
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <getopt.h>
 #include <sys/types.h>
 
+#if defined (HAVE_STRING_H)
+#include <string.h>
+#else
+#include <strings.h>
+#endif /* !HAVE_STRING_H */
+
 /* Get O_RDONLY.  */
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
@@ -342,12 +348,16 @@ char *
 my_strerror (errnum)
      int errnum;
 {
+#ifdef HAVE_STRERROR
+  return strerror(errnum);
+#else
   extern char *sys_errlist[];
   extern int sys_nerr;
 
   if (errnum >= 0 && errnum < sys_nerr)
     return sys_errlist[errnum];
   return (char *) "Unknown error";
+#endif
 }
 \f
 /* This table defines all the long-named options, says whether they