4 files changed, 8 insertions, 4 deletions
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 6b5235704..f57f7d9ec 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -6,17 +6,17 @@ case "$NGX_CC_NAME" in
 
     msvc*)
         ngx_makefile=makefile.msvc
-        ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
+        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
     ;;
 
     owc*)
         ngx_makefile=makefile.owc
-        ngx_opt="CPU_OPT=$CPU_OPT"
+        ngx_opt="CPU_OPT=\"$CPU_OPT\""
     ;;
 
     bcc)
         ngx_makefile=makefile.bcc
-        ngx_opt="-DCPU_OPT=$CPU_OPT"
+        ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
     ;;
 
 esac
@@ -26,7 +26,9 @@ case "$NGX_PLATFORM" in
 
     win32)
         cp auto/lib/pcre/patch.pcre.in $PCRE
+        cp auto/lib/pcre/patch.pcre.in.owc $PCRE
         cp auto/lib/pcre/patch.config.in $PCRE
+        cp auto/lib/pcre/patch.pcre.c $PCRE
         cp auto/lib/pcre/$ngx_makefile $PCRE
 
         ngx_pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"`
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc
index 411945260..a2dc5fbfc 100644
--- a/auto/lib/pcre/makefile.bcc
+++ b/auto/lib/pcre/makefile.bcc
@@ -18,3 +18,4 @@ pcre.lib:	pcre.h
 pcre.h:
 	patch -o pcre.h pcre.in patch.pcre.in
 	patch -o config.h config.in patch.config.in
+	patch -o pcre.c pcre.c patch.pcre.c
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 7c61d31f7..4da4e0c39 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -20,3 +20,4 @@ pcre.lib:	pcre.h
 pcre.h:
 	patch -o pcre.h pcre.in patch.pcre.in
 	patch -o config.h config.in patch.config.in
+	patch -o pcre.c pcre.c patch.pcre.c
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 227fd90af..8439c4cc2 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -15,5 +15,5 @@ pcre.lib:	pcre.h
 
 
 pcre.h:
-	patch -o pcre.h pcre.in patch.pcre.in
+	patch -o pcre.h pcre.in patch.pcre.in.owc
 	patch -o config.h config.in patch.config.in