From 25faccf92848c3f20dd7739d6faf600cc1360d95 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 2 Sep 1997 22:25:26 -0600 Subject: [PATCH] Makefile.in (install, [...]): Make these phony targets. * 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 for malloc et al. * util/install-info.c: Include . (my_strerror): Use strerror if available. Avoids alpha bug and redecl of sys_errlist problems. From-SVN: r15051 --- texinfo/ChangeLog | 11 +++++++++++ texinfo/Makefile.in | 37 ++----------------------------------- texinfo/makeinfo/makeinfo.c | 6 +++++- texinfo/util/install-info.c | 12 +++++++++++- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog index aea2b3864d8..d12ca235640 100644 --- 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 + + * makeinfo/makeinfo.c: Maybe include for malloc et al. + * util/install-info.c: Include . + (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 4a5083853eb..0539b9b71de 100644 --- 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 ee12ef27e71..fddc6d9560c 100644 --- 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 #endif +#if defined (STDC_HEADERS) +#include +#endif + #if defined (HAVE_STRING_H) #include #else diff --git a/texinfo/util/install-info.c b/texinfo/util/install-info.c index 53fa4aa1116..6e5fc903e4e 100644 --- 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 #include +#if defined (HAVE_STRING_H) +#include +#else +#include +#endif /* !HAVE_STRING_H */ + /* Get O_RDONLY. */ #ifdef HAVE_SYS_FCNTL_H #include @@ -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 } /* This table defines all the long-named options, says whether they -- 2.30.2