diff auto/lib/openssl/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 dfec0e090265
line wrap: on
line diff
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -22,7 +22,7 @@ case "$CC" in
 	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