summaryrefslogtreecommitdiffhomepage
path: root/auto/lib/openssl/make
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-05-12 13:15:43 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-05-12 13:15:43 +0000
commitd2af69adc6153a63856f45996ce178846c149dbd (patch)
tree8aa90d8c50308b168ee1cbb965390274d9b77947 /auto/lib/openssl/make
parentbba78036c8ea33694be50a6d55945f6e73e5a7c4 (diff)
downloadnginx-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/make')
-rw-r--r--auto/lib/openssl/make9
1 files changed, 3 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