comparison auto/install @ 376:edf1cb6c328e NGINX_0_7_0

nginx 0.7.0 *) Change: now the 0x00-0x1F, '"' and '\' characters are escaped as \xXX in an access_log. Thanks to Maxim Dounin. *) Change: now nginx allows several "Host" request header line. *) Feature: the "modified" flag in the "expires" directive. *) Feature: the $uid_got and $uid_set variables may be used at any request processing stage. *) Feature: the $hostname variable. Thanks to Andrei Nigmatulin. *) Feature: DESTDIR support. Thanks to Todd A. Fisher and Andras Voroskoi. *) Bugfix: a segmentation fault might occur in worker process on Linux, if keepalive was enabled.
author Igor Sysoev <http://sysoev.ru>
date Mon, 19 May 2008 00:00:00 +0400
parents 9fc4ab6673f9
children 392c16f2d858
comparison
equal deleted inserted replaced
375:52f3c9c7eff0 376:edf1cb6c328e
15 fi 15 fi
16 16
17 17
18 cat << END >> $NGX_MAKEFILE 18 cat << END >> $NGX_MAKEFILE
19 19
20 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 20 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
21 $NGX_INSTALL_PERL_MODULES 21 $NGX_INSTALL_PERL_MODULES
22 test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX' 22 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
23 23
24 test -d '`dirname "$NGX_SBIN_PATH"`' \ 24 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
25 || mkdir -p '`dirname "$NGX_SBIN_PATH"`' 25 || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
26 test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old' 26 test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \
27 cp $NGX_OBJS/nginx '$NGX_SBIN_PATH' 27 || mv '\$(DESTDIR)$NGX_SBIN_PATH' \
28 '\$(DESTDIR)$NGX_SBIN_PATH.old'
29 cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
28 30
29 test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX' 31 test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \
32 || mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
30 33
31 cp conf/koi-win '$NGX_CONF_PREFIX' 34 cp conf/koi-win '\$(DESTDIR)$NGX_CONF_PREFIX'
32 cp conf/koi-utf '$NGX_CONF_PREFIX' 35 cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
33 cp conf/win-utf '$NGX_CONF_PREFIX' 36 cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
34 37
35 test -f '$NGX_CONF_PREFIX/mime.types' \ 38 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
36 || cp conf/mime.types '$NGX_CONF_PREFIX' 39 || cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
37 cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default' 40 cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
38 41
39 test -f '$NGX_CONF_PREFIX/fastcgi_params' \ 42 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
40 || cp conf/fastcgi_params '$NGX_CONF_PREFIX' 43 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
41 cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default' 44 cp conf/fastcgi_params \
45 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
42 46
43 test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX' 47 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
44 cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default' 48 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
49 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
45 50
46 test -d '`dirname "$NGX_PID_PATH"`' \ 51 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
47 || mkdir -p '`dirname "$NGX_PID_PATH"`' 52 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
48 53
49 test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \ 54 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
50 mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`' 55 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
51 56
52 test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX' 57 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
58 || cp -r html '\$(DESTDIR)$NGX_PREFIX'
53 END 59 END
54 60
55 61
56 if test -n "$NGX_ERROR_LOG_PATH"; then 62 if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then
57 cat << END >> $NGX_MAKEFILE 63 cat << END >> $NGX_MAKEFILE
58 64
59 test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \ 65 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
60 mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`' 66 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
61 END 67 END
62 68
63 fi 69 fi