diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-12 13:15:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-12 13:15:43 +0000 |
| commit | d2af69adc6153a63856f45996ce178846c149dbd (patch) | |
| tree | 8aa90d8c50308b168ee1cbb965390274d9b77947 /auto/lib/zlib | |
| parent | bba78036c8ea33694be50a6d55945f6e73e5a7c4 (diff) | |
| download | nginx-d2af69adc6153a63856f45996ce178846c149dbd.tar.gz nginx-d2af69adc6153a63856f45996ce178846c149dbd.tar.bz2 | |
backout r2833: CURDIR was set to Unix style path
instead, do chdir inside Makefile
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/make | 9 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 74e6f9ac7..4d62b757f 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -7,17 +7,20 @@ case "$NGX_CC_NAME" in msvc*) ngx_makefile=makefile.msvc ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" + ngx_zlib="ZLIB=\"$ZLIB\"" ;; owc*) ngx_makefile=makefile.owc ngx_opt="CPU_OPT=\"$CPU_OPT\"" + ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; bcc) ngx_makefile=makefile.bcc ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" + ngx_zlib=`echo \-DZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; esac @@ -29,14 +32,10 @@ done=NO case "$NGX_PLATFORM" in win32) - cp auto/lib/zlib/$ngx_makefile $ZLIB - cat << END >> $NGX_MAKEFILE `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` - cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` - \$(MAKE) -f $ngx_makefile $ngx_opt - cd \$(CURDIR) + \$(MAKE) -f auto/lib/zlib/$ngx_makefile $ngx_opt $ngx_zlib END diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc index 2e7b71991..69a728c76 100644 --- a/auto/lib/zlib/makefile.bcc +++ b/auto/lib/zlib/makefile.bcc @@ -5,6 +5,8 @@ CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT) zlib.lib: + cd $(ZLIB) + bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \ compress.c diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index a4ee89a9c..d02f2b68e 100644 --- a/auto/lib/zlib/makefile.msvc +++ b/auto/lib/zlib/makefile.msvc @@ -5,6 +5,8 @@ CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) zlib.lib: + cd $(ZLIB) + cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \ diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc index dac43655f..13ee0e13c 100644 --- a/auto/lib/zlib/makefile.owc +++ b/auto/lib/zlib/makefile.owc @@ -5,5 +5,7 @@ CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) zlib.lib: + cd $(ZLIB) + wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj compress.obj |