aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-20 02:13:40 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-20 23:03:10 +0100
commitf3e5948af6a9b27aad9cd3224f67b6231da2f89f (patch)
treea877087566db3ffe531c7a758b3255346fe8b24b /Configurations
parentd57611ea1fa8be1930dfbc3f113674348d11f14c (diff)
downloadopenssl-f3e5948af6a9b27aad9cd3224f67b6231da2f89f.zip
openssl-f3e5948af6a9b27aad9cd3224f67b6231da2f89f.tar.gz
openssl-f3e5948af6a9b27aad9cd3224f67b6231da2f89f.tar.bz2
Have makedepend output to stdout and redirect it
This gives us better control of what files are produced. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl5
1 files changed, 2 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 48cea07..4dced5d 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -858,9 +858,8 @@ EOF
if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
$recipe .= <<"EOF";
$obj$depext: $deps
- rm -f \$\@.tmp; touch \$\@.tmp
- -\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
- 2>/dev/null
+ -\$(MAKEDEPEND) -f- -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
+ >\$\@.tmp 2>/dev/null
-\$(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; \\