From 38b71bd4704ee1746e862f5a7a4e170fd84a5eb0 Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Fri, 25 Oct 2019 17:47:25 +0100 Subject: [PATCH] Fix find/rm command in Unix clean recipe The `./pyca-cryptography/.travis/downstream.d` subdirectory that causes the `rm` command to fail (albeit harmlessly, but with a warning from `make` nonetheless). >rm -f `find . -name '*.d' \! -name '.*' -print` >rm: cannot remove './pyca-cryptography/.travis/downstream.d': Is a directory >make: [Makefile:1910: clean] Error 1 (ignored) Exclude directories from being matched by the `find` commands. CLA: trivial Reviewed-by: Patrick Steuer Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10264) --- Configurations/unix-Makefile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index d5deb87e96..6113ab4a34 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -460,8 +460,8 @@ libclean: clean: libclean $(RM) $(PROGRAMS) $(TESTPROGS) $(MODULES) $(SCRIPTS) $(RM) $(GENERATED_MANDATORY) $(GENERATED) - -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' -print` - -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' -print` + -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -print` + -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -print` $(RM) core $(RM) tags TAGS doc-nits $(RM) -r test/test-runs -- 2.25.1