Mercurial > hg > nginx

comparison auto/install @ 4354:cdb2e95bd3d0 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4231, r4300, r4303, r4304: Configure/build changes and fixes: *) Revamped "configure --help" text. *) FreeBSD 10-current has recently gotten POSIX_FADV_* macros. A fix for the broken build applied. *) AIX 7 defines sys_nerr in errno.h, therefore <errno.h> included in the sys_nerr test. When sys_nerr and _sys_nerr are missed on a particular platform and our euristic for a maximum errno detection applied always print the maximum errno number we reached instead of printing void. This makes possible to build nginx on AIX 7.1. *) Made it possible to build/install from the SVN checkout.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Dec 2011 13:34:16 +0000
parents 4d45c138e3df
children 5fce387b5e6c
comparison
equal deleted inserted replaced
4353:710e35d17c28 4354:cdb2e95bd3d0
70 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH 70 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
71 ;; 71 ;;
72 esac 72 esac
73 73
74 74
75 if test -e man/nginx.8 ; then
76 NGX_MAN=man/nginx.8
77 else
78 NGX_MAN=docs/man/nginx.8
79 fi
80
81 if test -d html ; then
82 NGX_HTML=html
83 else
84 NGX_HTML=docs/html
85 fi
86
75 cat << END >> $NGX_MAKEFILE 87 cat << END >> $NGX_MAKEFILE
76 88
77 manpage: $NGX_OBJS/nginx.8 89 manpage: $NGX_OBJS/nginx.8
78 90
79 $NGX_OBJS/nginx.8: man/nginx.8 $NGX_AUTO_CONFIG_H 91 $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CONFIG_H
80 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\ 92 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
81 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ 93 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
82 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ 94 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
83 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\ 95 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
84 < man/nginx.8 > $NGX_OBJS/nginx.8 96 < $NGX_MAN > \$@
85 97
86 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 98 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
87 $NGX_INSTALL_PERL_MODULES 99 $NGX_INSTALL_PERL_MODULES
88 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 100 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
89 101
133 145
134 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \ 146 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
135 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' 147 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
136 148
137 test -d '\$(DESTDIR)$NGX_PREFIX/html' \ 149 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
138 || cp -r html '\$(DESTDIR)$NGX_PREFIX' 150 || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
139 END 151 END
140 152
141 153
142 if test -n "$NGX_ERROR_LOG_PATH"; then 154 if test -n "$NGX_ERROR_LOG_PATH"; then
143 cat << END >> $NGX_MAKEFILE 155 cat << END >> $NGX_MAKEFILE