diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-11 18:02:06 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-11 18:02:06 +0000 |
| commit | 3d746ac4f02807196373e641b10c8f284ccb7646 (patch) | |
| tree | ebeef14e954da88c5b0e4afb6cb011e9c7fba798 | |
| parent | ec9f47175ef9acd7299c6c0c0b707113e178bbaf (diff) | |
| download | nginx-3d746ac4f02807196373e641b10c8f284ccb7646.tar.gz nginx-3d746ac4f02807196373e641b10c8f284ccb7646.tar.bz2 | |
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.
| -rw-r--r-- | auto/lib/md5/make | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 4 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 5 | ||||
| -rw-r--r-- | auto/lib/sha1/make | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 2 | ||||
| -rw-r--r-- | auto/make | 1 |
6 files changed, 8 insertions, 8 deletions
diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 22189da8a..759507979 100644 --- 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 96b86befa..3031dd2e8 100644 --- 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 219b52d73..ee5aff635 100644 --- 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 bd1036e1f..90f3af995 100644 --- 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 715d2cf96..74e6f9ac7 100644 --- 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 @@ -22,6 +22,7 @@ CC = $CC CFLAGS = $CFLAGS CPP = $CPP LINK = $LINK +CURDIR = `pwd` END |