diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-11-12 18:39:51 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-11-12 18:39:51 +0000 |
| commit | 033598bc073da23dcec5e4ea80b85cccecd8958a (patch) | |
| tree | b5c907bbebaefe9915049d45aef7610d03157527 /misc | |
| parent | d39777712d97180ff439461813083cbc7892a2a1 (diff) | |
| download | nginx-033598bc073da23dcec5e4ea80b85cccecd8958a.tar.gz nginx-033598bc073da23dcec5e4ea80b85cccecd8958a.tar.bz2 | |
Merge of r4870, r4871, r4890, r4895: minor fixes.
*) Made sure to initialize the entire ngx_file_t structure.
Found by Coverity.
*) Correct plural form for "path" in the whole source base.
*) Removed conditional compilation from waitpid() error test.
There are reports that call to a signal handler for an exited process
despite waitpid() already called for the process may happen on Linux
as well.
*) Style, parentheses instead of braces in misc/GNUMakefile.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/GNUmakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index a41c9c8ba..c524b7ffe 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -86,7 +86,7 @@ snapshot: win32: ./auto/configure \ --with-cc=cl \ - --builddir=${OBJS} \ + --builddir=$(OBJS) \ --with-debug \ --prefix= \ --conf-path=conf/nginx.conf \ @@ -100,8 +100,8 @@ win32: --http-scgi-temp-path=temp/scgi_temp \ --http-uwsgi-temp-path=temp/uwsgi_temp \ --with-cc-opt=-DFD_SETSIZE=1024 \ - --with-pcre=${OBJS}/lib/${PCRE} \ - --with-zlib=${OBJS}/lib/${ZLIB} \ + --with-pcre=$(OBJS)/lib/$(PCRE) \ + --with-zlib=$(OBJS)/lib/$(ZLIB) \ --with-select_module \ --with-http_realip_module \ --with-http_addition_module \ @@ -114,7 +114,7 @@ win32: --with-http_random_index_module \ --with-http_secure_link_module \ --with-mail \ - --with-openssl=${OBJS}/lib/${OPENSSL} \ + --with-openssl=$(OBJS)/lib/$(OPENSSL) \ --with-openssl-opt=enable-tlsext \ --with-http_ssl_module \ --with-mail_ssl_module \ |