[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  b7c9aa645e4eddf5d198d2b20f1c6a74ab96f98e (commit)
       via  d423c5ad6509293a29a308919c696515d29e5e3f (commit)
      from  a29fa98cebdb2904dcf844d1aea7d1be3b6b913a (commit)


- Log -----------------------------------------------------------------
commit b7c9aa645e4eddf5d198d2b20f1c6a74ab96f98e
Author: Ben Laurie <ben at links.org>
Date:   Sat Oct 1 12:41:36 2016 +0100

    Remove untrue comment.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d423c5ad6509293a29a308919c696515d29e5e3f
Author: Ben Laurie <ben at links.org>
Date:   Sat Oct 1 12:40:58 2016 +0100

    Make dependencies if Makefile is new.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index bb7ce1c..b610b58 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -301,13 +301,11 @@ distclean: clean
 	$(RM) configdata.pm
 	$(RM) Makefile
 
-# This exists solely for those who still type 'make depend'
-#
 # We check if any depfile is newer than Makefile and decide to
 # concatenate only if that is true.
 depend:
 	@: {- output_off() if $disabled{makedepend}; "" -}
-	@if [ -n "`find $(DEPS) -newer Makefile 2>/dev/null; exit 0`" ]; then \
+	@if egrep "^# DO NOT DELETE THIS LINE" Makefile >/dev/null && [ -z "`find $(DEPS) -newer Makefile 2>/dev/null; exit 0`" ]; then :; else \
 	  ( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \
 	    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \
 	    echo; \