IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Igor Sysoev 2009-05-11 18:02:06 +00:00
parent ec9f47175e
commit 3d746ac4f0
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/lib/md5/make
View File

@ -35,7 +35,7 @@ case "$NGX_PLATFORM" in
`echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
cd `echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` cd `echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"`
\$(MAKE) -f $ngx_makefile $ngx_opt \$(MAKE) -f $ngx_makefile $ngx_opt
cd ..\\..\\.. cd \$(CURDIR)
END END

4
auto/lib/openssl/make
View File

@ -22,7 +22,7 @@ $OPENSSL/out32/ssleay32.lib:
perl Configure VC-WIN32 no-shared perl Configure VC-WIN32 no-shared
ms\\do_ms ms\\do_ms
\$(MAKE) -f ms\\nt.mak \$(MAKE) -f ms\\nt.mak
cd ..\\..\\.. cd \$(CURDIR)
END END
@ -39,7 +39,7 @@ END
perl Configure BC-32 no-shared perl Configure BC-32 no-shared
ms\\do_nasm ms\\do_nasm
\$(MAKE) -f ms\\bcb.mak \$(MAKE) -f ms\\bcb.mak
cd ..\\..\\.. cd \$(CURDIR)
END END

5
auto/lib/pcre/make
View File

@ -38,13 +38,12 @@ case "$NGX_PLATFORM" in
`echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
cd $ngx_pcre cd $ngx_pcre
\$(MAKE) -f $ngx_makefile pcre.h \$(MAKE) -f $ngx_makefile pcre.h
cd ..\\..\\.. cd \$(CURDIR)
`echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"`
cd $ngx_pcre cd $ngx_pcre
\$(MAKE) -f $ngx_makefile $ngx_opt \$(MAKE) -f $ngx_makefile $ngx_opt
cd ..\\..\\.. cd \$(CURDIR)
END END

2
auto/lib/sha1/make
View File

@ -35,7 +35,7 @@ case "$NGX_PLATFORM" in
`echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
cd `echo $SHA1 | sed -e "s/\//$ngx_regex_dirsep/g"` cd `echo $SHA1 | sed -e "s/\//$ngx_regex_dirsep/g"`
\$(MAKE) -f $ngx_makefile $ngx_opt \$(MAKE) -f $ngx_makefile $ngx_opt
cd ..\\..\\.. cd \$(CURDIR)
END END

2
auto/lib/zlib/make
View File

@ -36,7 +36,7 @@ case "$NGX_PLATFORM" in
`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"`
\$(MAKE) -f $ngx_makefile $ngx_opt \$(MAKE) -f $ngx_makefile $ngx_opt
cd ..\\..\\.. cd \$(CURDIR)
END END

1
auto/make
View File

@ -22,6 +22,7 @@ CC = $CC
CFLAGS = $CFLAGS CFLAGS = $CFLAGS
CPP = $CPP CPP = $CPP
LINK = $LINK LINK = $LINK
CURDIR = `pwd`
END END