summaryrefslogtreecommitdiff
path: root/dist-check.mk
diff options
context:
space:
mode:
authorBrian C. Lane <bcl@redhat.com>2019-07-16 11:43:54 -0700
committerBrian C. Lane <bcl@redhat.com>2019-08-09 11:54:54 -0700
commit5a322ad32410aef4b991455425709a10a6e08cdf (patch)
treed0cdc27300bb5833142690ab6afa912ac5ae75c1 /dist-check.mk
parent5aa01e23101e7b6e897903c52eae21863ea072b2 (diff)
downloadparted-5a322ad32410aef4b991455425709a10a6e08cdf.tar.gz
dist-check.mk: Remove empty .deps directories
Borrowed from coreutils commits 373ba16f332d and 40434e566e52
Diffstat (limited to 'dist-check.mk')
-rw-r--r--dist-check.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/dist-check.mk b/dist-check.mk
index 310f0d0..70ad2af 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -161,6 +161,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 -r rmdir
diff -ur $(t)/$(distdir).old $(t)/$(distdir)
-rm -rf $(t)
rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)