From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 3 Oct 2003 08:58:00 +0000 (+0000)
Subject: For Debian Bug #213524:
X-Git-Tag: Release-1-7b~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8271758fb7232031e941bfc14b33a7bfcf36e4b;p=thirdparty%2Fautomake.git

For Debian Bug #213524:
* lib/am/texinfos.am (install-info-am, uninstall-info-am): Merge
stderr and stdout, and grep only the first line while testing
install-info --version's output.  This revert part of the change
from 2001-05-18.
---

diff --git a/ChangeLog b/ChangeLog
index a9befce8e..20d96f06d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-03  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	For Debian Bug #213524:
+	* lib/am/texinfos.am (install-info-am, uninstall-info-am): Merge
+	stderr and stdout, and grep only the first line while testing
+	install-info --version's output.  This revert part of the change
+	from 2001-05-18.
+
 2003-10-01  Akim Demaille  <akim@epita.fr>
 
 	* m4/amversion.in: Add (C) to the Copyright notice.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fb8ee63ba..50a842543 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -229,7 +229,7 @@ maintainer-clean-vti:
 uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -425,7 +425,7 @@ install-info-am: $(INFO_DEPS)
 	done
 	@$(POST_INSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index ff19b2398..a6cc47337 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -148,15 +148,16 @@ 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.  Debian install-info v1.8.3
-## prints version info to stderr.
+## away, we can remove this hack.  Some versions of Debian install-info
+## print their version on stderr (e.g. 1.8.3), other do it in
+## on stdout (e.g. 1.10.15).
 ##
 ## Do not use
-##    install-info --version 2>&1 | sed 1q | grep -s -v -i debian
+##    install-info --version 2>&1 | sed 1q | grep -v -i debian
 ## as if install-info does not exist, grep -v will be happy, and
 ## therefore the code will be triggered although install-info is missing.
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 ## Strip directory
@@ -191,10 +192,9 @@ if %?LOCAL-TEXIS%
 uninstall-info-am:
 	$(PRE_UNINSTALL)
 ## Run two loops here so that we can handle PRE_UNINSTALL and
-## NORMAL_UNINSTALL correctly.  Debian install-info v1.8.3 prints
-## version info to stderr.
+## NORMAL_UNINSTALL correctly.
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \