The branch master has been updated
via 853094dbe15a49b334f3488fc99a557abf021c09 (commit)
from 3c74e77bd89e3d5400ab4d640149e27863756579 (commit)
- Log -----------------------------------------------------------------
commit 853094dbe15a49b334f3488fc99a557abf021c09
Author: Richard Levitte <levi...@openssl.org>
Date: Mon Aug 12 11:46:23 2019 +0200
Configurations/unit-Makefile.tmpl: Don't clean away dotted files
A local 'make clean' did some sweeping removals of files execpt for
the .git directory. This is a little too sweeping, as other dotted
files might be cleaned away if they happen to match the pattern that's
searched for.
An example is a symlink .dir-locals.el that would keep disappearing if
you build in the source tree and do a make clean...
So we change this to leave all dotted files alone. Our builds do not
produce such files anyway, so this is a harmless (or rather, less
harmful) change.
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9573)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 9309f40bab..45f53cc546 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -391,13 +391,13 @@ libclean:
clean: libclean
$(RM) $(PROGRAMS) $(TESTPROGS) $(MODULES) $(SCRIPTS)
$(RM) $(GENERATED_MANDATORY) $(GENERATED)
- -$(RM) `find . -name .git -prune -o -name '*{- platform->depext() -}'
-print`
- -$(RM) `find . -name .git -prune -o -name '*{- platform->objext() -}'
-print`
+ -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' -print`
+ -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' -print`
$(RM) core
$(RM) tags TAGS doc-nits
$(RM) -r test/test-runs
$(RM) openssl.pc libcrypto.pc libssl.pc
- -$(RM) `find . -name .git -prune -o -type l -print`
+ -$(RM) `find . -type l \! -name '.*' -print`
$(RM) $(TARFILE)
distclean: clean
