提交 29b28eee 编写于 作者: R Richard Levitte

Not all shells understand !

In unix-Makefile.tmpl, this construction has been used a few times

	if ! something; then ...

It seems, though, that some shells do not understand !, so these need
to be changed.
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 08538fc0
...@@ -283,10 +283,10 @@ depend: ...@@ -283,10 +283,10 @@ depend:
for d in $(DEPS); do \ for d in $(DEPS); do \
if [ -f $$d ]; then cat $$d; fi; \ if [ -f $$d ]; then cat $$d; fi; \
done ) > Makefile.new; \ done ) > Makefile.new; \
if ! cmp Makefile.new Makefile >/dev/null 2>&1; then \ if cmp Makefile.new Makefile >/dev/null 2>&1; then \
mv -f Makefile.new Makefile; \
else \
rm -f Makefile.new; \ rm -f Makefile.new; \
else \
mv -f Makefile.new Makefile; \
fi; \ fi; \
fi fi
@: {- output_on() if $disabled{makedepend}; "" -} @: {- output_on() if $disabled{makedepend}; "" -}
...@@ -895,10 +895,10 @@ $obj$depext: $deps ...@@ -895,10 +895,10 @@ $obj$depext: $deps
perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; #\\ perl -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; #\\
\$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); #\\ \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); #\\
\$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp
\@if ! cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\ \@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
mv \$\@.tmp \$\@; \\
else \\
rm -f \$\@.tmp; \\ rm -f \$\@.tmp; \\
else \\
mv \$\@.tmp \$\@; \\
fi fi
EOF EOF
$deps = $obj.$depext; $deps = $obj.$depext;
...@@ -914,10 +914,10 @@ EOF ...@@ -914,10 +914,10 @@ EOF
$obj$objext: $deps $obj$objext: $deps
\$(CC) \$(CFLAGS) $ecflags$incs -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs \$(CC) \$(CFLAGS) $ecflags$incs -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs
\@touch $obj$depext.tmp \@touch $obj$depext.tmp
\@if ! cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\ \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
mv $obj$depext.tmp $obj$depext; \\
else \\
rm -f $obj$depext.tmp; \\ rm -f $obj$depext.tmp; \\
else \\
mv $obj$depext.tmp $obj$depext; \\
fi fi
EOF EOF
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册