changeset 4199:874a2f505e2a

Fixed configuration summary and manpage contents for the special --error-log-path=stderr case.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 12 Oct 2011 09:04:59 +0000
parents 9ff4acd99289
children 4f5b3714eead
files auto/install
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/auto/install
+++ b/auto/install
@@ -53,7 +53,7 @@ esac
 
 
 case ".$NGX_ERROR_LOG_PATH" in
-    ./*)
+    ./* | .)
     ;;
 
     *)
@@ -80,7 +80,7 @@ manpage:	$NGX_OBJS/nginx.8
 	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${ng
 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"`' || \