[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4def90c5de3465bd4bc69d069d5f50367108ab27 (commit)
      from  29b28eee3eb6620fa72e6c94b3957ecea0f059b5 (commit)


- Log -----------------------------------------------------------------
commit 4def90c5de3465bd4bc69d069d5f50367108ab27
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 15 22:16:35 2016 +0100

    Make the perl dependency post-processor into just one line
    
    Make doesn't always treat multiline quoted strings as nicely as one
    would wish.
    
    Reviewed-by: Andy Polyakov <appro 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 da6b880..117c404 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -892,9 +892,7 @@ $obj$depext: $deps
 	rm -f \$\@.tmp; touch \$\@.tmp
 	-\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
 	    2>/dev/null
-	perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//;               #\\
-	             \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); #\\
-	             \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
+	perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
 	\@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
 		rm -f \$\@.tmp; \\
 	else \\