* texinfos.am (uninstall-info-am): Debian install-info v1.8.3

	prints to stderr.
	(install-info-am): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 56c7710ec44cecd2ea995e6102ae737c3d046c42..799bce6b6c4361abdf610c826aa2a44e41cc6057 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-05  Tom Tromey  <tromey@redhat.com>
+
+       * texinfos.am (uninstall-info-am): Debian install-info v1.8.3
+       prints to stderr.
+       (install-info-am): Likewise.
+
 2001-05-05  Pavel Roskin <proski@gnu.org>
 
        * automake.in (scan_texinfo_file): Don't push undefined values

diff --git a/THANKS b/THANKS
index 354ff4b72f117dc766f720286758b8bf9bb6e5f8..3cfba73bd7a9844756184166c3befe32c1b56da4 100644 (file)
--- 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 0261ad05706bfa90cfb9f4b8ba2c4449609b2912..2a831b360965b489a87bba2f059172b3a609068f 100644 (file)
--- 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 0261ad05706bfa90cfb9f4b8ba2c4449609b2912..2a831b360965b489a87bba2f059172b3a609068f 100644 (file)
--- 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,