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.
This commit is contained in:
parent
e7797d0b20
commit
5e2e84b975
6 changed files with 8 additions and 8 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue