Fixed configuration summary and manpage contents for the special

--error-log-path=stderr case.
This commit is contained in:
Ruslan Ermilov 2011-10-12 09:04:59 +00:00
parent c8fdda4c2f
commit 88ca608da1

View File

@ -53,7 +53,7 @@ esac
case ".$NGX_ERROR_LOG_PATH" in case ".$NGX_ERROR_LOG_PATH" in
./*) ./* | .)
;; ;;
*) *)
@ -80,7 +80,7 @@ $NGX_OBJS/nginx.8: man/nginx.8 $NGX_AUTO_CONFIG_H
sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\ sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
-e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
-e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
-e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\ -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
< man/nginx.8 > $NGX_OBJS/nginx.8 < man/nginx.8 > $NGX_OBJS/nginx.8
install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
@ -139,7 +139,7 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
END END
if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then if test -n "$NGX_ERROR_LOG_PATH"; then
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \ test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \