From 40434e566e5281c5243c1510ecffcc66d45921c1 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 30 Nov 2016 14:47:08 +0000 Subject: maint: avoid "make distcheck" failure without excess .deps directories * Makefile.am (my-distcheck): Add the -r option to xargs so that rmdir doesn't return an error when there are no extraneous .deps dirs. --- dist-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist-check.mk b/dist-check.mk index 9f8db1345..afa24bfd8 100644 --- a/dist-check.mk +++ b/dist-check.mk @@ -123,7 +123,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check) # 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 + 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) -- cgit v1.2.3-70-g09d2