From: Tom Tromey <tromey@redhat.com>
Date: Sat, 14 Jul 2001 20:12:52 +0000 (+0000)
Subject: 2001-07-14  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>
X-Git-Tag: Release-1-4j~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3f036e267ce6aea2c02f18e724ffaf466f3b029;p=thirdparty%2Fautomake.git

2001-07-14  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>

	* lib/am/distdir.am (distcheck): Emit diagnostic when files
	remain after "make uninstall".
---

diff --git a/ChangeLog b/ChangeLog
index 67bc722a0..6d68c630d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-14  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>
+
+	* lib/am/distdir.am (distcheck): Emit diagnostic when files
+	remain after "make uninstall".
+
 2001-07-14  Tom Tromey  <tromey@redhat.com>
 
 	* lib/am/tags.am (.PHONY): Depend on GTAGS.  From Shigio Yamaguchi.
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 3b11fc1d1..e808966a0 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -262,7 +262,9 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 ## We use -le 1 because the `dir' file might still exist after uninstall.
-	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	     || (echo "Error: files left after uninstall" 1>&2; \
+	         exit 1) ) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
 ## Make sure to remove the dist file we created in the test build