From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 15 Apr 2003 20:40:31 +0000 (+0000)
Subject: * lib/am/distdir.am (distuninstallcheck, distcleancheck): Silent
X-Git-Tag: Release-1-7-3b~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c72520e25efc6fe5c1ec92af034a1566bade6ca6;p=thirdparty%2Fautomake.git

* lib/am/distdir.am (distuninstallcheck, distcleancheck): Silent
these rules, so that we don't confuse users by echoing
"echo ERROR:" commands which are not run.
---

diff --git a/ChangeLog b/ChangeLog
index ca9ca86a7..a2a9fe614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-15  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/am/distdir.am (distuninstallcheck, distcleancheck): Silent
+	these rules, so that we don't confuse users by echoing
+	"echo ERROR:" commands which are not run.
+
 2003-03-14  Richard Dawe  <rich@phekda.freeserve.co.uk>
 	    Alexandre Duret-Lutz  <adl@gnu.org>
 
diff --git a/Makefile.in b/Makefile.in
index 439f2914f..8ba170fe6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -566,7 +566,7 @@ distcheck: dist
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
 distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -575,11 +575,11 @@ distuninstallcheck:
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 3555eecb0..a06744f9e 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -354,9 +354,9 @@ distcheck: dist
 .PHONY: distuninstallcheck
 distuninstallcheck_listfiles = find . -type f -print
 distuninstallcheck:
-## We use -le 1 because the `dir' file might still exist after
-## uninstall.
-	cd $(distuninstallcheck_dir) \
+## We use -le 1 because the `dir' file (created by install-info)
+## might still exist after uninstall.
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -370,11 +370,11 @@ distuninstallcheck:
 .PHONY: distcleancheck
 distcleancheck_listfiles = find . -type f -print
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2