Mercurial > hg > nginx-quic
changeset 2832:d27ac70df098
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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 11 May 2009 18:02:06 +0000 |
parents | a294cff147ec |
children | cc5d214387f4 |
files | auto/lib/md5/make auto/lib/openssl/make auto/lib/pcre/make auto/lib/sha1/make auto/lib/zlib/make auto/make |
diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -22,7 +22,7 @@ case "$CC" in 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
--- 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
--- 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