From: Tom Tromey <tromey@redhat.com>
Date: Sat, 18 Nov 2000 23:58:24 +0000 (+0000)
Subject: 	* m4/depend.m4 (AM_DEPENDENCIES): Redirect `$am_depcomp' stdout to
X-Git-Tag: Release-1-4b~27
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8cdcb6c9c8c298a8c4aab3ece0026e4a65f4ecac;p=automake.git

	* m4/depend.m4 (AM_DEPENDENCIES): Redirect `$am_depcomp' stdout to
	/dev/null.  From Paul Martinolich.
---

diff --git a/ChangeLog b/ChangeLog
index 03dfe497..9eb061ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-18  Tom Tromey  <tromey@cygnus.com>
+
+	* m4/depend.m4 (AM_DEPENDENCIES): Redirect `$am_depcomp' stdout to
+	/dev/null.  From Paul Martinolich.
+
 2000-11-16  Morten Eriksen  <mortene@sim.no>
 
 	* aclocal.in (write_aclocal): Set ``binmode'' after file has been
diff --git a/Makefile.in b/Makefile.in
index 2c5d266f..15220e5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,6 @@
 # Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -176,9 +175,11 @@ $(srcdir)/version.texi: stamp-vti
 	@:
 
 $(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp
-	@echo "@set EDITION $(VERSION)" >> vti.tmp
-	@echo "@set VERSION $(VERSION)" >> vti.tmp
+	@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`; \
+	echo "@set UPDATED $$1 $$2 $$3"; \
+	echo "@set UPDATED-MONTH $$2 $$3"; \
+	echo "@set EDITION $(VERSION)"; \
+	echo "@set VERSION $(VERSION)") > vti.tmp
 	@cmp -s vti.tmp $(srcdir)/version.texi \
 	  || (echo "Updating $(srcdir)/version.texi"; \
 	      cp vti.tmp $(srcdir)/version.texi)
@@ -383,10 +384,11 @@ maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
diff --git a/THANKS b/THANKS
index 79a7db7f..33204736 100644
--- a/THANKS
+++ b/THANKS
@@ -98,6 +98,7 @@ Olly Betts		olly@muscat.co.uk
 Paul Berrevoets		paul@swi.com
 Paul D. Smith		psmith@BayNetworks.COM
 Paul Eggert 		eggert@twinsun.com
+Paul Martinolich	martinol@datasync.com
 Pavel Roskin		pavel_roskin@geocities.com
 Per Bothner		bothner@cygnus.com
 Per Cederqvist		ceder@lysator.liu.se
diff --git a/m4/depend.m4 b/m4/depend.m4
index 0f004f99..510af529 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -47,7 +47,7 @@ if test -z "$AMDEP"; then
     if depmode="$depmode" \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1; then
       am_cv_[$1]_dependencies_compiler_type="$depmode"
       break