From 8437856ad3100bc5d175107da66ef797d25ef57d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 5 May 2001 22:08:48 +0000 Subject: [PATCH] * texinfos.am (uninstall-info-am): Debian install-info v1.8.3 prints to stderr. (install-info-am): Likewise. --- ChangeLog | 6 ++++++ THANKS | 1 + lib/am/texinfos.am | 10 ++++++---- texinfos.am | 10 ++++++---- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56c7710e..799bce6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-05-05 Tom Tromey + + * texinfos.am (uninstall-info-am): Debian install-info v1.8.3 + prints to stderr. + (install-info-am): Likewise. + 2001-05-05 Pavel Roskin * automake.in (scan_texinfo_file): Don't push undefined values diff --git a/THANKS b/THANKS index 354ff4b7..3cfba73b 100644 --- a/THANKS +++ b/THANKS @@ -49,6 +49,7 @@ H.J. Lu hjl@lucon.org Harlan Stenn Harlan.Stenn@pfcs.com Henrik Frystyk Nielsen frystyk@w3.org Ian Lance Taylor ian@cygnus.com +Inoue inoue@ainet.or.jp Janos Farkas chexum@shadow.banki.hu Jason Molenda crash@cygnus.co.jp Jeff Bailey Jbailey@phn.ca diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 0261ad05..2a831b36 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -78,8 +78,9 @@ install-info-am: $(INFO_DEPS) @$(POST_INSTALL) ## Only run this code if install-info actually exists, and it is not ## the Debian install-info. FIXME: once Debian install-info goes -## away, we can remove this hack. - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +## away, we can remove this hack. Debian install-info v1.8.3 +## prints version info to stderr. + @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ ## Run `:' after install-info in case install-info fails. We really @@ -107,8 +108,9 @@ install-info-am: $(INFO_DEPS) uninstall-info-am: $(PRE_UNINSTALL) ## Run two loops here so that we can handle PRE_UNINSTALL and -## NORMAL_UNINSTALL correctly. - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +## NORMAL_UNINSTALL correctly. Debian install-info v1.8.3 prints +## version info to stderr. + @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ ## install-info needs the actual info file. We use the installed one, diff --git a/texinfos.am b/texinfos.am index 0261ad05..2a831b36 100644 --- a/texinfos.am +++ b/texinfos.am @@ -78,8 +78,9 @@ install-info-am: $(INFO_DEPS) @$(POST_INSTALL) ## Only run this code if install-info actually exists, and it is not ## the Debian install-info. FIXME: once Debian install-info goes -## away, we can remove this hack. - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +## away, we can remove this hack. Debian install-info v1.8.3 +## prints version info to stderr. + @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ ## Run `:' after install-info in case install-info fails. We really @@ -107,8 +108,9 @@ install-info-am: $(INFO_DEPS) uninstall-info-am: $(PRE_UNINSTALL) ## Run two loops here so that we can handle PRE_UNINSTALL and -## NORMAL_UNINSTALL correctly. - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +## NORMAL_UNINSTALL correctly. Debian install-info v1.8.3 prints +## version info to stderr. + @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ ## install-info needs the actual info file. We use the installed one, -- 2.43.5