]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
maint: avoid "make distcheck" failure due to excess .deps directories
authorJim Meyering <meyering@fb.com>
Wed, 14 Sep 2016 21:16:40 +0000 (14:16 -0700)
committerJim Meyering <meyering@fb.com>
Tue, 22 Nov 2016 18:21:25 +0000 (10:21 -0800)
* 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".

dist-check.mk

index 533b7f92135a9d2970ab72974773495b826a5670..9f8db134524bc6fb64591ec4994caf1cd1aedb17 100644 (file)
@@ -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)