Mercurial > hg > nginx

comparison auto/install @ 4242:025396b57ec1 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4013, r4200: error_log related fixes: *) Complain on invalid log levels. Previously only first log level was required to be correct, while error_log directive in fact accepts list of levels (e.g. one may specify "error_log ... debug_core debug_http;"). This resulted in (avoidable) wierd behaviour on missing semicolon after error_log directive, e.g. error_log /path/to/log info index index.php; silently skipped index directive and it's arguments (trying to interpret them as log levels without checking to be correct). *) Fixed configuration summary and manpage contents for the special --error-log-path=stderr case.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 11:23:26 +0000
parents 569716d0e447
children 4d45c138e3df
comparison
equal deleted inserted replaced
4241:6afb20bf2ad5 4242:025396b57ec1
51 ;; 51 ;;
52 esac 52 esac
53 53
54 54
55 case ".$NGX_ERROR_LOG_PATH" in 55 case ".$NGX_ERROR_LOG_PATH" in
56 ./*) 56 ./* | .)
57 ;; 57 ;;
58 58
59 *) 59 *)
60 NGX_ERROR_LOG_PATH=$NGX_PREFIX/$NGX_ERROR_LOG_PATH 60 NGX_ERROR_LOG_PATH=$NGX_PREFIX/$NGX_ERROR_LOG_PATH
61 ;; 61 ;;
76 76
77 manpage: 77 manpage:
78 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\ 78 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
79 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ 79 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
80 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ 80 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
81 -e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\ 81 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
82 < man/nginx.8 > $NGX_OBJS/nginx.8 82 < man/nginx.8 > $NGX_OBJS/nginx.8
83 83
84 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 84 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
85 $NGX_INSTALL_PERL_MODULES 85 $NGX_INSTALL_PERL_MODULES
86 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 86 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
135 test -d '\$(DESTDIR)$NGX_PREFIX/html' \ 135 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
136 || cp -r html '\$(DESTDIR)$NGX_PREFIX' 136 || cp -r html '\$(DESTDIR)$NGX_PREFIX'
137 END 137 END
138 138
139 139
140 if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then 140 if test -n "$NGX_ERROR_LOG_PATH"; then
141 cat << END >> $NGX_MAKEFILE 141 cat << END >> $NGX_MAKEFILE
142 142
143 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \ 143 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
144 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' 144 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
145 END 145 END