use $(CURDIR) instead of "..\..\.." because the later does not allow to use

options as --with-zlib=../zlib-1.2.3.  It seems there is no common way
to learn the current directory in Win32 make's: although nmake has MAKEDIR
variable, nevertheless Borland make's MAKEDIR is the directory where make
is installed, and OpenWatcom wmake has no MAKEDIR at all.

diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 22189da8a34ffc992adf41f2be2d5784f168efb3..75950797903f2c4e21c79d46035fea1a82a9bdd6 100644 (file)
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -35,7 +35,7 @@ case "$NGX_PLATFORM" in
 `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 ..\\..\\..
+       cd \$(CURDIR)
 
 END
 

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 96b86befaaf41882a23661f3bb6e001dba46c0df..3031dd2e827e690d42f0e41aa9544000aa222cec 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 ..\\..\\..
+       cd \$(CURDIR)
 
 END
 
@@ -39,7 +39,7 @@ END
        perl Configure BC-32 no-shared
        ms\\do_nasm
        \$(MAKE) -f ms\\bcb.mak
-       cd ..\\..\\..
+       cd \$(CURDIR)
 
 END
 

diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 219b52d73229002ed744fedd03f712cb6a231f99..ee5aff635c2d04fd43ee526a1cf2b61043e8b12c 100644 (file)
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -38,13 +38,12 @@ case "$NGX_PLATFORM" in
 `echo "$PCRE/pcre.h:   $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
        cd $ngx_pcre
        \$(MAKE) -f $ngx_makefile pcre.h
-       cd ..\\..\\..
-
+       cd \$(CURDIR)
 
 `echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"`
        cd $ngx_pcre
        \$(MAKE) -f $ngx_makefile $ngx_opt
-       cd ..\\..\\..
+       cd \$(CURDIR)
 
 END
 

diff --git a/auto/lib/sha1/make b/auto/lib/sha1/make
index bd1036e1f1ab91b3abef5cbb783bf40d187f4331..90f3af995547e809f3ee7430ac1570763cea45bb 100644 (file)
--- a/auto/lib/sha1/make
+++ b/auto/lib/sha1/make
@@ -35,7 +35,7 @@ case "$NGX_PLATFORM" in
 `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 ..\\..\\..
+       cd \$(CURDIR)
 
 END
 

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 715d2cf96bce3682ee4ca24062c8beba352c7b43..74e6f9ac78b3a9b0581f13727c0bea319c3589be 100644 (file)
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -36,7 +36,7 @@ case "$NGX_PLATFORM" in
 `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 ..\\..\\..
+       cd \$(CURDIR)
 
 END
 

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