diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2019-10-25 17:47:25 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-10-31 10:34:13 +0000 |
| commit | 38b71bd4704ee1746e862f5a7a4e170fd84a5eb0 (patch) | |
| tree | eb69fc54b43b35c42490a42583189ae739f05581 /Configurations | |
| parent | f059e4cc435b7b850cfc8188d265a8925edff0bd (diff) | |
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 <patrick.steuer@de.ibm.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10264)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
1 files 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 |