Mercurial > hg > nginx-vendor-1-0

comparison auto/install @ 642:1b80544421e8 NGINX_1_0_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.11 *) Change: now double quotes are encoded in an "echo" SSI-command output. Thanks to Zaur Abasmirzoev. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if SNI was used; the bug had appeared in 1.0.9. *) Bugfix: SIGWINCH signal did not work after first binary upgrade; the bug had appeared in 1.0.9. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: in the "scgi_param" directive, if complex parameters were used. *) Bugfix: "add_header" and "expires" directives did not work if a request was proxied and response status code was 206. *) Bugfix: in the "expires @time" directive. *) Bugfix: in the ngx_http_flv_module. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on FreeBSD 10. *) Bugfix: nginx could not be built on AIX.
author Igor Sysoev <http://sysoev.ru>
date Thu, 15 Dec 2011 00:00:00 +0400
parents 692f4d4d7f10
children ad25218fd14b
comparison
equal deleted inserted replaced
641:e21c9e01ce08 642:1b80544421e8
70 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH 70 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
71 ;; 71 ;;
72 esac 72 esac
73 73
74 74
75 if test -e man/nginx.8 ; then
76 NGX_MAN=man/nginx.8
77 else
78 NGX_MAN=docs/man/nginx.8
79 fi
80
81 if test -d html ; then
82 NGX_HTML=html
83 else
84 NGX_HTML=docs/html
85 fi
86
75 cat << END >> $NGX_MAKEFILE 87 cat << END >> $NGX_MAKEFILE
76 88
77 manpage: 89 manpage: $NGX_OBJS/nginx.8
90
91 $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CONFIG_H
78 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\ 92 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
79 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ 93 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
80 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ 94 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
81 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\ 95 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
82 < man/nginx.8 > $NGX_OBJS/nginx.8 96 < $NGX_MAN > \$@
83 97
84 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 98 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
85 $NGX_INSTALL_PERL_MODULES 99 $NGX_INSTALL_PERL_MODULES
86 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 100 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
87 101
131 145
132 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \ 146 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
133 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' 147 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
134 148
135 test -d '\$(DESTDIR)$NGX_PREFIX/html' \ 149 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
136 || cp -r html '\$(DESTDIR)$NGX_PREFIX' 150 || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
137 END 151 END
138 152
139 153
140 if test -n "$NGX_ERROR_LOG_PATH"; then 154 if test -n "$NGX_ERROR_LOG_PATH"; then
141 cat << END >> $NGX_MAKEFILE 155 cat << END >> $NGX_MAKEFILE