comparison misc/GNUmakefile @ 4902:db9ce6fc9482 stable-1.2

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 12 Nov 2012 18:39:51 +0000
parents ce42f6b8d1d2
children 0112e3dcc51b
comparison
equal deleted inserted replaced
4901:a0cb7fc23cc2 4902:db9ce6fc9482
84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) 84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
85 85
86 win32: 86 win32:
87 ./auto/configure \ 87 ./auto/configure \
88 --with-cc=cl \ 88 --with-cc=cl \
89 --builddir=${OBJS} \ 89 --builddir=$(OBJS) \
90 --with-debug \ 90 --with-debug \
91 --prefix= \ 91 --prefix= \
92 --conf-path=conf/nginx.conf \ 92 --conf-path=conf/nginx.conf \
93 --pid-path=logs/nginx.pid \ 93 --pid-path=logs/nginx.pid \
94 --http-log-path=logs/access.log \ 94 --http-log-path=logs/access.log \
98 --http-proxy-temp-path=temp/proxy_temp \ 98 --http-proxy-temp-path=temp/proxy_temp \
99 --http-fastcgi-temp-path=temp/fastcgi_temp \ 99 --http-fastcgi-temp-path=temp/fastcgi_temp \
100 --http-scgi-temp-path=temp/scgi_temp \ 100 --http-scgi-temp-path=temp/scgi_temp \
101 --http-uwsgi-temp-path=temp/uwsgi_temp \ 101 --http-uwsgi-temp-path=temp/uwsgi_temp \
102 --with-cc-opt=-DFD_SETSIZE=1024 \ 102 --with-cc-opt=-DFD_SETSIZE=1024 \
103 --with-pcre=${OBJS}/lib/${PCRE} \ 103 --with-pcre=$(OBJS)/lib/$(PCRE) \
104 --with-zlib=${OBJS}/lib/${ZLIB} \ 104 --with-zlib=$(OBJS)/lib/$(ZLIB) \
105 --with-select_module \ 105 --with-select_module \
106 --with-http_realip_module \ 106 --with-http_realip_module \
107 --with-http_addition_module \ 107 --with-http_addition_module \
108 --with-http_sub_module \ 108 --with-http_sub_module \
109 --with-http_dav_module \ 109 --with-http_dav_module \
112 --with-http_mp4_module \ 112 --with-http_mp4_module \
113 --with-http_gzip_static_module \ 113 --with-http_gzip_static_module \
114 --with-http_random_index_module \ 114 --with-http_random_index_module \
115 --with-http_secure_link_module \ 115 --with-http_secure_link_module \
116 --with-mail \ 116 --with-mail \
117 --with-openssl=${OBJS}/lib/${OPENSSL} \ 117 --with-openssl=$(OBJS)/lib/$(OPENSSL) \
118 --with-openssl-opt=enable-tlsext \ 118 --with-openssl-opt=enable-tlsext \
119 --with-http_ssl_module \ 119 --with-http_ssl_module \
120 --with-mail_ssl_module \ 120 --with-mail_ssl_module \
121 --with-ipv6 121 --with-ipv6
122 122