merge r3477:

zlib 1.2.4 compatibility

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 4d62b757f858d5c4385d817b83d6c321cd804ce7..b874b04addd14ea063d38835d8e4398de64c918d 100644 (file)
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -53,7 +53,7 @@ END
 
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) clean \\
+       && \$(MAKE) distclean \\
        && cp contrib/asm586/match.S . \\
        && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
                ./configure \\
@@ -70,7 +70,7 @@ END
 
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) clean \\
+       && \$(MAKE) distclean \\
        && cp contrib/asm686/match.S . \\
        && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
                ./configure \\
@@ -103,7 +103,7 @@ if [ $done = NO ]; then
 
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) clean \\
+       && \$(MAKE) distclean \\
        && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
                ./configure \\
        && \$(MAKE) libz.a