]> git.kaiwu.me - nginx.git/commitdiff
Fixed configuration summary and manpage contents for the special
authorRuslan Ermilov <ru@nginx.com>
Wed, 12 Oct 2011 09:04:59 +0000 (09:04 +0000)
committerRuslan Ermilov <ru@nginx.com>
Wed, 12 Oct 2011 09:04:59 +0000 (09:04 +0000)
--error-log-path=stderr case.

auto/install

index 6cf217e73c2feb30c9e68bb6a6c1d8eebe147b7a..d77efbf74cea36f13fd05bfc78861a3b986b54d5 100644 (file)
@@ -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"`' || \