[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1b4d0e3c1ed556b890b93d8326978a6a90cfc0fe (commit)
      from  531e9dcc243a967832fbe784dfc0d226422216b2 (commit)


- Log -----------------------------------------------------------------
commit 1b4d0e3c1ed556b890b93d8326978a6a90cfc0fe
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date:   Mon May 16 16:10:24 2016 +0300

    do not remove links found in .git directory
    
    Some setups use links inside .git directory and make clean should not
    remove them to avoid breaking git meta-information.
    
    Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
    
    CLA: none; trivial
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1078)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index ea3b708..a31867e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -259,7 +259,7 @@ clean: libclean
 	rm -f core
 	rm -f tags TAGS
 	rm -f openssl.pc libcrypto.pc libssl.pc
-	-rm -f `find . -type l`
+	-rm -f `find . -type l -a \! -path "./.git/*"`
 	rm -f $(TARFILE)
 
 # This exists solely for those who still type 'make depend'