From: Jim Meyering <meyering@fb.com>
Date: Wed, 14 Sep 2016 21:16:40 +0000 (-0700)
Subject: maint: avoid "make distcheck" failure due to excess .deps directories
X-Git-Tag: v8.26~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=373ba16f332d0632f2ce987893ed67bb4334c5d2;p=thirdparty%2Fcoreutils.git

maint: avoid "make distcheck" failure due to excess .deps directories

* Makefile.am (my-distcheck): Remove all .deps directories before the
recursive diff that searches for left-behind files.  Otherwise, with
automake master (some time after v1.15), "make distcheck" would fail
due to those directories being left behind after "make distclean".
---

diff --git a/dist-check.mk b/dist-check.mk
index 533b7f9213..9f8db13452 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -120,6 +120,10 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
 	)
 	(cd $(t) && mv $(distdir) $(distdir).old	\
 	  && $(amtar_extract_) - ) < $(preferred_tarball_)
+# With post-v1.15 automake, "distclean" would fail to remove .deps
+# directories, leading to a spurious failure of the following recursive diff.
+# FIXME: remove this, once automake is fixed.
+	find $(t)/$(distdir).old $(t)/$(distdir) -name .deps | xargs rmdir
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
 	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)