Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/auto/lib/sha1/make +++ b/auto/lib/sha1/make @@ -7,16 +7,19 @@ case "$NGX_CC_NAME" in msvc*) ngx_makefile=makefile.msvc ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM" + ngx_sha1="SHA1=\"$SHA1\"" ;; owc*) ngx_makefile=makefile.owc ngx_opt="CPU_OPT=\"$CPU_OPT\"" + ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; bcc) ngx_makefile=makefile.bcc ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM" + ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; esac @@ -28,14 +31,10 @@ done=NO case "$NGX_PLATFORM" in win32) - cp auto/lib/sha1/$ngx_makefile $SHA1 - cat << END >> $NGX_MAKEFILE `echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` - cd `echo $SHA1 | sed -e "s/\//$ngx_regex_dirsep/g"` - \$(MAKE) -f $ngx_makefile $ngx_opt - cd \$(CURDIR) + \$(MAKE) -f auto/lib/sha1/$ngx_makefile $ngx_opt $ngx_sha1 END