aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2011-10-12 09:04:59 +0000
committerRuslan Ermilov <ru@nginx.com>2011-10-12 09:04:59 +0000
commit88ca608da196d315e29558ab8b685d9977aab65a (patch)
treeb64005551f82a1c7555ce3ba7b4ae8c6b0147c32
parentc8fdda4c2ff95422ffc1fbe39cb16f847992ecd0 (diff)
downloadnginx-88ca608da196d315e29558ab8b685d9977aab65a.tar.gz
nginx-88ca608da196d315e29558ab8b685d9977aab65a.zip
Fixed configuration summary and manpage contents for the special
--error-log-path=stderr case.
-rw-r--r--auto/install6
1 files changed, 3 insertions, 3 deletions
diff --git a/auto/install b/auto/install
index 6cf217e73..d77efbf74 100644
--- a/auto/install
+++ b/auto/install
@@ -53,7 +53,7 @@ esac
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|" \\
-e "s|%%PID_PATH%%|$NGX_PID_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
install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
@@ -139,7 +139,7 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
END
-if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then
+if test -n "$NGX_ERROR_LOG_PATH"; then
cat << END >> $NGX_MAKEFILE
test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \