From 423baef4c0712e87d4e544475fb73e32661f84b5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 Oct 1996 08:01:31 +0000 Subject: [PATCH] work around bug in install-info --- ChangeLog | 2 ++ Makefile.in | 2 +- TODO | 7 +++---- lib/am/texinfos.am | 7 ++++++- texinfos.am | 7 ++++++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24e8f70e..9fff957a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Sun Oct 6 00:43:01 1996 Tom Tromey + * texinfos.am: Run : after install-info. + * aclocal.in (parse_arguments): Better error message. * automake.in (parse_arguments): Better error message. diff --git a/Makefile.in b/Makefile.in index f8b700ec..2cf5b7ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -202,7 +202,7 @@ install-info: $(INFO_DEPS) $(POST_INSTALL) if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ - install-info --info-dir=$(infodir) $$file; \ + install-info --info-dir=$(infodir) $$file; :;\ done; \ else : ; fi diff --git a/TODO b/TODO index 19cf6342..21fd66e2 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,8 @@ Priorities for release: !! documentation (eg new macros) +* `acinstall' +* echo in installs? +* `missing' program Further: - texinfo/info changes @@ -50,10 +53,6 @@ Per> then it should be able to realize it can build .class files from Per> .java files, and thus be able to generate a list of Per> .class files from a list of .java source files. -* fix this distribution to be fully standards compliant - * pathchk says we run over the limit - * must change aclocal's implementation somehow -- gross - * actually use acinstall program !! Must fix require_file stuff. It is really gross, and I don't diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 46992950..78de7dd2 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -52,7 +52,12 @@ install-info: $(INFO_DEPS) ## Only run this code if install-info actually exists. if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ - install-info --info-dir=$(infodir) $$file; \ +## Run `:' after install-info in case install-info fails. We really +## don't care about failures here, because they can be spurious. For +## instance if you don't have a dir file, install-info will fail. I +## think instead it should create a new dir file for you. This bug +## causes the `make distcheck' target to fail reliably. + install-info --info-dir=$(infodir) $$file; :;\ done; \ else : ; fi diff --git a/texinfos.am b/texinfos.am index 46992950..78de7dd2 100644 --- a/texinfos.am +++ b/texinfos.am @@ -52,7 +52,12 @@ install-info: $(INFO_DEPS) ## Only run this code if install-info actually exists. if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ - install-info --info-dir=$(infodir) $$file; \ +## Run `:' after install-info in case install-info fails. We really +## don't care about failures here, because they can be spurious. For +## instance if you don't have a dir file, install-info will fail. I +## think instead it should create a new dir file for you. This bug +## causes the `make distcheck' target to fail reliably. + install-info --info-dir=$(infodir) $$file; :;\ done; \ else : ; fi -- 2.43.5