Mercurial > hg > nginx

comparison auto/lib/zlib/make @ 2838:ecdc41bf2047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout r2833: CURDIR was set to Unix style path instead, do chdir inside Makefile
author Igor Sysoev <igor@sysoev.ru>
date Tue, 12 May 2009 13:15:43 +0000
parents d27ac70df098
children 213f417ab428
comparison
equal deleted inserted replaced
2837:c670227c485a 2838:ecdc41bf2047
5 case "$NGX_CC_NAME" in 5 case "$NGX_CC_NAME" in
6 6
7 msvc*) 7 msvc*)
8 ngx_makefile=makefile.msvc 8 ngx_makefile=makefile.msvc
9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" 9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
10 ngx_zlib="ZLIB=\"$ZLIB\""
10 11
11 ;; 12 ;;
12 13
13 owc*) 14 owc*)
14 ngx_makefile=makefile.owc 15 ngx_makefile=makefile.owc
15 ngx_opt="CPU_OPT=\"$CPU_OPT\"" 16 ngx_opt="CPU_OPT=\"$CPU_OPT\""
17 ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
16 ;; 18 ;;
17 19
18 bcc) 20 bcc)
19 ngx_makefile=makefile.bcc 21 ngx_makefile=makefile.bcc
20 ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" 22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
23 ngx_zlib=`echo \-DZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
21 ;; 24 ;;
22 25
23 esac 26 esac
24 27
25 28
27 30
28 31
29 case "$NGX_PLATFORM" in 32 case "$NGX_PLATFORM" in
30 33
31 win32) 34 win32)
32 cp auto/lib/zlib/$ngx_makefile $ZLIB
33
34 cat << END >> $NGX_MAKEFILE 35 cat << END >> $NGX_MAKEFILE
35 36
36 `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` 37 `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
37 cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` 38 \$(MAKE) -f auto/lib/zlib/$ngx_makefile $ngx_opt $ngx_zlib
38 \$(MAKE) -f $ngx_makefile $ngx_opt
39 cd \$(CURDIR)
40 39
41 END 40 END
42 41
43 done=YES 42 done=YES
44 ;; 43 ;;