backout r2833: CURDIR was set to Unix style path

instead, do chdir inside Makefile

diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 75950797903f2c4e21c79d46035fea1a82a9bdd6..60af28ccad6ef067040b164897c11f3620b86c62 100644 (file)
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -7,16 +7,19 @@ case "$NGX_CC_NAME" in
     msvc*)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM"
+        ngx_md5="MD5=\"$MD5\""
     ;;
 
     owc*)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
     bcc)
         ngx_makefile=makefile.bcc
         ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM"
+        ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
 esac
@@ -28,14 +31,10 @@ done=NO
 case "$NGX_PLATFORM" in
 
     win32)
-        cp auto/lib/md5/$ngx_makefile $MD5
-
         cat << END                                        >> $NGX_MAKEFILE
 
 `echo "$MD5/md5.lib:   $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
-       cd `echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"`
-       \$(MAKE) -f $ngx_makefile $ngx_opt
-       cd \$(CURDIR)
+       \$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5
 
 END
 

diff --git a/auto/lib/md5/makefile.bcc b/auto/lib/md5/makefile.bcc
index 6d2151b2176d6ee66ea8565e64bbbec62983a0ef..c02ef95bd1a3263d71d59eac6d8aa23ac903ecd8 100644 (file)
--- a/auto/lib/md5/makefile.bcc
+++ b/auto/lib/md5/makefile.bcc
@@ -7,12 +7,14 @@ CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
 !if "$(MD5_ASM)" == "YES"
 
 md5.lib:
+       cd $(MD5)
        bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
        tlib md5.lib +md5_dgst.obj +"asm\m-win32.obj"
 
 !else
 
 md5.lib:
+       cd $(MD5)
        bcc32 -c $(CFLAGS) md5_dgst.c
        tlib md5.lib +md5_dgst.obj
 

diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 2798d6512c5f5f89926cc46e42c54c7fa39e53c9..233da0fb5924944fd64e7960b7cbfbe1019c660f 100644 (file)
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -7,12 +7,14 @@ CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
 !IF "$(MD5_ASM)" == "YES"
 
 md5.lib:
+       cd $(MD5)
        cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c
        link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
 
 !ELSE
 
 md5.lib:
+       cd $(MD5)
        cl -c $(CFLAGS) md5_dgst.c
        link -lib -out:md5.lib md5_dgst.obj
 

diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
index 5fffa170761f072f51b2c430fc778ea61f25f193..c36c9369fcc9e24250fbec7661c2beb550031afa 100644 (file)
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@@ -5,5 +5,6 @@
 CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
 
 md5.lib:
+       cd $(MD5)
        wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
        wlib -n md5.lib md5_dgst.obj

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 3031dd2e827e690d42f0e41aa9544000aa222cec..b2150c0a2fb42c87dedf9f96a5e87ce39b6d3b95 100644 (file)
--- 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
 

diff --git a/auto/lib/openssl/makefile.bcc b/auto/lib/openssl/makefile.bcc
new file mode 100644 (file)
index 0000000..3534b0e
--- /dev/null
+++ b/auto/lib/openssl/makefile.bcc
@@ -0,0 +1,12 @@
+
+# Copyright (C) Igor Sysoev
+
+
+ssleay32.lib:
+       cd $(OPENSSL)
+
+       perl Configure BC-32 no-shared
+
+       ms\do_nasm
+
+       $(MAKE) -f ms\bcb.mak

diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index ee5aff635c2d04fd43ee526a1cf2b61043e8b12c..021aab9fbe3baa240dd56ba6832166541f15a996 100644 (file)
--- 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 239d1293af4a34bf9b00c207ed2330358fd9ca9e..d31a5aa51c87e4f05f542732ca0cd3108d578418 100644 (file)
--- 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 8c40920821565a9412b68488421aa128e0108b3a..c62c821340e01115edc5eb43bdb536723ec22cdb 100644 (file)
--- 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 8439c4cc2f603b0944767c2e0e8fadc6ca8b2dee..12c62201079b27cdf703da85aee7bed15b87d5f0 100644 (file)
--- 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

diff --git a/auto/lib/sha1/make b/auto/lib/sha1/make
index 90f3af995547e809f3ee7430ac1570763cea45bb..6c89acf1b109210ee62bed3c5e253162b3bdcd26 100644 (file)
--- 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 255e56a89fd9a9d5a238bb53dcd972cf8b4d9cec..1d8b5e4c8b08f54038289b4211ad52759d761399 100644 (file)
--- 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 929e4622bf6f47ec85465467b5ecb605ea2bd060..4abd366cad3bd90c2d83fb4b6a02b2c1113785e2 100644 (file)
--- 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 767870d8a529523c4181ad11417428d406fe8d62..c1a3e04311c995d0e69d41f246c1362517ab3eee 100644 (file)
--- 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

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 74e6f9ac78b3a9b0581f13727c0bea319c3589be..4d62b757f858d5c4385d817b83d6c321cd804ce7 100644 (file)
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -7,17 +7,20 @@ case "$NGX_CC_NAME" in
     msvc*)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
+        ngx_zlib="ZLIB=\"$ZLIB\""
 
     ;;
 
     owc*)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
     bcc)
         ngx_makefile=makefile.bcc
         ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
+        ngx_zlib=`echo \-DZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
     ;;
 
 esac
@@ -29,14 +32,10 @@ done=NO
 case "$NGX_PLATFORM" in
 
     win32)
-        cp auto/lib/zlib/$ngx_makefile $ZLIB
-
         cat << END                                            >> $NGX_MAKEFILE
 
 `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
-       cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"`
-       \$(MAKE) -f $ngx_makefile $ngx_opt
-       cd \$(CURDIR)
+       \$(MAKE) -f auto/lib/zlib/$ngx_makefile $ngx_opt $ngx_zlib
 
 END
 

diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc
index 2e7b719918231bd6f0c0062218f7eb73fdfd091a..69a728c76a9bf7ec95998efeedfd60f45711449f 100644 (file)
--- a/auto/lib/zlib/makefile.bcc
+++ b/auto/lib/zlib/makefile.bcc
@@ -5,6 +5,8 @@
 CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT)
 
 zlib.lib:
+       cd $(ZLIB)
+
        bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \
                compress.c
 

diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc
index a4ee89a9ca389bb5f155c82cb8565828502e92d2..d02f2b68e37349b429ac1b1859de2fb346596c0c 100644 (file)
--- a/auto/lib/zlib/makefile.msvc
+++ b/auto/lib/zlib/makefile.msvc
@@ -5,6 +5,8 @@
 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
 
 zlib.lib:
+       cd $(ZLIB)
+
        cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
 
        link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \

diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc
index dac43655fed9e876acf9cd1f7cd6fb1099a90f21..13ee0e13ce1fa17937161a765575aecbd8a181ff 100644 (file)
--- a/auto/lib/zlib/makefile.owc
+++ b/auto/lib/zlib/makefile.owc
@@ -5,5 +5,7 @@
 CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
 
 zlib.lib:
+       cd $(ZLIB)
+
        wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
        wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj compress.obj

diff --git a/auto/make b/auto/make
index bc3ccc80138641984f29b143772526d214debebd..27f71ecdccb2cb25f28cd04dadb66a54bc2987ef 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -22,7 +22,6 @@ CC =  $CC
 CFLAGS = $CFLAGS
 CPP =  $CPP
 LINK = $LINK
-CURDIR = `pwd`
 
 END