backout r2833: CURDIR was set to Unix style path

instead, do chdir inside Makefile

4 files changed, 17 insertions, 12 deletions

diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index ee5aff635..021aab9fb 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -7,16 +7,19 @@ case "$NGX_CC_NAME" in
     msvc*)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
+        ngx_pcre="PCRE=\"$PCRE\""
     ;;
 
     owc*)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
     bcc)
         ngx_makefile=makefile.bcc
         ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
+        ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
 esac
@@ -29,21 +32,14 @@ case "$NGX_PLATFORM" in
         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"`
 
         cat << END                                            >> $NGX_MAKEFILE
 
 `echo "$PCRE/pcre.h:	$NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
-	cd $ngx_pcre
-	\$(MAKE) -f $ngx_makefile pcre.h
-	cd \$(CURDIR)
+	\$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h
 
 `echo "$PCRE/pcre.lib:	$PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"`
-	cd $ngx_pcre
-	\$(MAKE) -f $ngx_makefile $ngx_opt
-	cd \$(CURDIR)
+	\$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre $ngx_opt
 
 END
 
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc
index 239d1293a..d31a5aa51 100644
--- a/auto/lib/pcre/makefile.bcc
+++ b/auto/lib/pcre/makefile.bcc
@@ -6,7 +6,9 @@ CFLAGS =	-q -O2 -tWM -w-8004 $(CPU_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
-pcre.lib:	pcre.h
+pcre.lib:
+	cd $(PCRE)
+
 	bcc32 -q -edftables dftables.c
 
 	dftables > chartables.c
@@ -16,6 +18,7 @@ pcre.lib:	pcre.h
 	tlib pcre.lib +maketables.obj +get.obj +study.obj +pcre.obj
 
 pcre.h:
+	cd $(PCRE)
 	patch -o pcre.h pcre.in patch.pcre.in
 	patch -o config.h config.in patch.config.in
 	patch < patch.pcre.c
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 8c4092082..c62c82134 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -6,7 +6,9 @@ CFLAGS =	-O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
-pcre.lib:	pcre.h
+pcre.lib:
+	cd $(PCRE)
+
 	cl -Fedftables dftables.c
 
 	dftables > chartables.c
@@ -18,6 +20,7 @@ pcre.lib:	pcre.h
 		maketables.obj get.obj study.obj pcre.obj
 
 pcre.h:
+	cd $(PCRE)
 	patch -o pcre.h pcre.in patch.pcre.in
 	patch -o config.h config.in patch.config.in
 	patch < patch.pcre.c
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 8439c4cc2..12c622010 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -6,7 +6,9 @@ CFLAGS =	-c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
-pcre.lib:	pcre.h
+pcre.lib:
+	cd $(PCRE)
+
 	wcl386 -zq -bt=nt -l=nt -fe=dftables dftables.c
 	dftables > chartables.c
 
@@ -15,5 +17,6 @@ pcre.lib:	pcre.h
 
 
 pcre.h:
+	cd $(PCRE)
 	patch -o pcre.h pcre.in patch.pcre.in.owc
 	patch -o config.h config.in patch.config.in