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/openssl | |
| 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/openssl')
| -rw-r--r-- | auto/lib/openssl/make | 9 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.bcc | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 3031dd2e8..b2150c0a2 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -22,7 +22,7 @@ $OPENSSL/out32/ssleay32.lib: perl Configure VC-WIN32 no-shared ms\\do_ms \$(MAKE) -f ms\\nt.mak - cd \$(CURDIR) + cd \$(MAKEDIR) END @@ -35,11 +35,8 @@ END | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$OPENSSL\\out32\\ssleay32.lib:" | sed -e "s/\//$ngx_regex_dirsep/g"` - cd `echo "$OPENSSL" | sed -e "s/\//$ngx_regex_dirsep/g"` - perl Configure BC-32 no-shared - ms\\do_nasm - \$(MAKE) -f ms\\bcb.mak - cd \$(CURDIR) + \$(MAKE) -f auto/lib/openssl/$ngx_makefile \ + -DOPENSSL=`echo \"$OPENSSL\" | sed -e "s/\//$ngx_regex_dirsep/g"` END diff --git a/auto/lib/openssl/makefile.bcc b/auto/lib/openssl/makefile.bcc new file mode 100644 index 000000000..3534b0ef8 --- /dev/null +++ b/auto/lib/openssl/makefile.bcc @@ -0,0 +1,12 @@ + +# Copyright (C) Igor Sysoev + + +ssleay32.lib: + cd $(OPENSSL) + + perl Configure BC-32 no-shared + + ms\do_nasm + + $(MAKE) -f ms\bcb.mak |