Mercurial > hg > nginx

comparison auto/install @ 4199:874a2f505e2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7e3c557c2604
children b375a7f0d51a
comparison
equal deleted inserted replaced
4198:9ff4acd99289 4199:874a2f505e2a
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 ;;
78 78
79 $NGX_OBJS/nginx.8: man/nginx.8 $NGX_AUTO_CONFIG_H 79 $NGX_OBJS/nginx.8: man/nginx.8 $NGX_AUTO_CONFIG_H
80 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\ 80 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
81 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ 81 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
82 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ 82 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
83 -e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\ 83 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
84 < man/nginx.8 > $NGX_OBJS/nginx.8 84 < man/nginx.8 > $NGX_OBJS/nginx.8
85 85
86 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 86 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
87 $NGX_INSTALL_PERL_MODULES 87 $NGX_INSTALL_PERL_MODULES
88 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 88 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
137 test -d '\$(DESTDIR)$NGX_PREFIX/html' \ 137 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
138 || cp -r html '\$(DESTDIR)$NGX_PREFIX' 138 || cp -r html '\$(DESTDIR)$NGX_PREFIX'
139 END 139 END
140 140
141 141
142 if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then 142 if test -n "$NGX_ERROR_LOG_PATH"; then
143 cat << END >> $NGX_MAKEFILE 143 cat << END >> $NGX_MAKEFILE
144 144
145 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \ 145 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
146 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' 146 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
147 END 147 END