diff auto/lib/zlib/make @ 295:99b349386504

nginx-0.0.3-2004-03-25-23:03:02 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 25 Mar 2004 20:03:02 +0000
parents 35a6a9df2d25
children ee394e997c77
line wrap: on
line diff
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -1,5 +1,5 @@
 
-case $CC in
+case "$CC" in
 
     cl)
         makefile=makefile.msvc
@@ -48,7 +48,8 @@ case $PLATFORM in
             pentium)
                 echo "	cd $ZLIB \\"                              >> $MAKEFILE
                 echo "	&& cp contrib/asm586/match.S . \\"        >> $MAKEFILE
-                echo "	&& CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE
+                echo "	&& CFLAGS=\"$ZLIB_OPT -DASMV\" \\"        >> $MAKEFILE
+                echo "		CC=\"\$(CC)\" \\"                 >> $MAKEFILE
                 echo "		./configure \\"                   >> $MAKEFILE
                 echo "	&& \$(MAKE) OBJA=match.o libz.a"          >> $MAKEFILE
 
@@ -58,7 +59,8 @@ case $PLATFORM in
             pentiumpro)
                 echo "	cd $ZLIB \\"                              >> $MAKEFILE
                 echo "	&& cp contrib/asm686/match.S . \\"        >> $MAKEFILE
-                echo "	&& CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE
+                echo "	&& CFLAGS=\"$ZLIB_OPT -DASMV\" \\"        >> $MAKEFILE
+                echo "		CC=\"\$(CC)\" \\"                 >> $MAKEFILE
                 echo "		./configure \\"                   >> $MAKEFILE
                 echo "	&& \$(MAKE) OBJA=match.o libz.a"          >> $MAKEFILE
 
@@ -72,7 +74,8 @@ esac
 
 if [ $done = NO ]; then
     echo "	cd $ZLIB \\"                                      >> $MAKEFILE
-    echo "	&& CC=$CC CFLAGS=\"$ZLIB_OPT\" ./configure \\"    >> $MAKEFILE
+    echo "	&& CFLAGS=\"$ZLIB_OPT\" CC=\"\$(CC)\" \\"         >> $MAKEFILE
+    echo "		./configure \\"                           >> $MAKEFILE
     echo "	&& \$(MAKE) libz.a"                               >> $MAKEFILE
 fi