[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  d573ff17939458f7b14d56770641c11a83b98d10 (commit)
      from  21ebd2fc3fc00d7871ad00f52daffde4039da665 (commit)


- Log -----------------------------------------------------------------
commit d573ff17939458f7b14d56770641c11a83b98d10
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Aug 18 17:45:08 2018 +0200

    Configurations/unix-Makefile.tmpl: address find portability issue.
    
    -path is non-portable extension, fortunately it's possible to express
    .git subdirectory exclusion with -prune.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7004)

-----------------------------------------------------------------------

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 c492740..16af4d2 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -413,13 +413,13 @@ libclean:
 clean: libclean
 	$(RM) $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
 	$(RM) $(GENERATED_MANDATORY) $(GENERATED)
-	-$(RM) `find . -name '*{- $depext -}' -a \! -path "./.git/*"`
-	-$(RM) `find . -name '*{- $objext -}' -a \! -path "./.git/*"`
+	-$(RM) `find . -name .git -prune -o -name '*{- $depext -}' -print`
+	-$(RM) `find . -name .git -prune -o -name '*{- $objext -}' -print`
 	$(RM) core
 	$(RM) tags TAGS doc-nits
 	$(RM) -r test/test-runs
 	$(RM) openssl.pc libcrypto.pc libssl.pc
-	-$(RM) `find . -type l -a \! -path "./.git/*"`
+	-$(RM) `find . -name .git -prune -o -type l -print`
 	$(RM) $(TARFILE)
 
 distclean: clean