4 files changed, 9 insertions, 5 deletions
diff --git a/auto/lib/sha1/make b/auto/lib/sha1/make
index 90f3af995..6c89acf1b 100644
--- 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
 
diff --git a/auto/lib/sha1/makefile.bcc b/auto/lib/sha1/makefile.bcc
index 255e56a89..1d8b5e4c8 100644
--- a/auto/lib/sha1/makefile.bcc
+++ b/auto/lib/sha1/makefile.bcc
@@ -7,12 +7,14 @@ CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
 !if "$(SHA1_ASM)" == "YES"
 
 sha1.lib:
+	cd $(SHA1)
 	bcc32 -c $(CFLAGS) -DSHA1_ASM sha1dgst.c
 	tlib sha1.lib +sha1dgst.obj +"asm\s-win32.obj"
 
 !else
 
 sha1.lib:
+	cd $(SHA1)
 	bcc32 -c $(CFLAGS) sha1dgst.c
 	tlib sha1.lib +sha1dgst.obj
 
diff --git a/auto/lib/sha1/makefile.msvc b/auto/lib/sha1/makefile.msvc
index 929e4622b..4abd366ca 100644
--- a/auto/lib/sha1/makefile.msvc
+++ b/auto/lib/sha1/makefile.msvc
@@ -7,12 +7,14 @@ CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
 !IF "$(SHA1_ASM)" == "YES"
 
 sha1.lib:
+	cd $(SHA1)
 	cl -c $(CFLAGS) -D SHA1_ASM sha1dgst.c
 	link -lib -out:sha1.lib sha1dgst.obj asm/s-win32.obj
 
 !ELSE
 
 sha1.lib:
+	cd $(SHA1)
 	cl -c $(CFLAGS) sha1dgst.c
 	link -lib -out:sha1.lib sha1dgst.obj
 
diff --git a/auto/lib/sha1/makefile.owc b/auto/lib/sha1/makefile.owc
index 767870d8a..c1a3e0431 100644
--- a/auto/lib/sha1/makefile.owc
+++ b/auto/lib/sha1/makefile.owc
@@ -5,5 +5,6 @@
 CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
 
 sha1.lib:
+	cd $(SHA1)
 	wcl386 -c $(CFLAGS) -dL_ENDIAN sha1dgst.c
 	wlib -n sha1.lib sha1dgst.obj