Mercurial > hg > nginx
comparison auto/lib/sha1/make @ 2838:ecdc41bf2047
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 | d620f497c50f |
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 SHA1_ASM=$SHA1_ASM" | 9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM" |
10 ngx_sha1="SHA1=\"$SHA1\"" | |
10 ;; | 11 ;; |
11 | 12 |
12 owc*) | 13 owc*) |
13 ngx_makefile=makefile.owc | 14 ngx_makefile=makefile.owc |
14 ngx_opt="CPU_OPT=\"$CPU_OPT\"" | 15 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
16 ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` | |
15 ;; | 17 ;; |
16 | 18 |
17 bcc) | 19 bcc) |
18 ngx_makefile=makefile.bcc | 20 ngx_makefile=makefile.bcc |
19 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM" | 21 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM" |
22 ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` | |
20 ;; | 23 ;; |
21 | 24 |
22 esac | 25 esac |
23 | 26 |
24 | 27 |
26 | 29 |
27 | 30 |
28 case "$NGX_PLATFORM" in | 31 case "$NGX_PLATFORM" in |
29 | 32 |
30 win32) | 33 win32) |
31 cp auto/lib/sha1/$ngx_makefile $SHA1 | |
32 | |
33 cat << END >> $NGX_MAKEFILE | 34 cat << END >> $NGX_MAKEFILE |
34 | 35 |
35 `echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` | 36 `echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` |
36 cd `echo $SHA1 | sed -e "s/\//$ngx_regex_dirsep/g"` | 37 \$(MAKE) -f auto/lib/sha1/$ngx_makefile $ngx_opt $ngx_sha1 |
37 \$(MAKE) -f $ngx_makefile $ngx_opt | |
38 cd \$(CURDIR) | |
39 | 38 |
40 END | 39 END |
41 | 40 |
42 done=YES | 41 done=YES |
43 ;; | 42 ;; |