annotate auto/install @ 6205:dcae651b2a0c

OCSP stapling: fixed ssl_stapling_file (ticket #769). Broken by 6893a1007a7c (1.9.2) during introduction of strict OCSP response validity checks. As stapling file is expected to be returned unconditionally, fix is to set its validity to the maximum supported time. Reported by Faidon Liambotis.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 07 Jul 2015 16:38:49 +0300
parents c983c8dea44c
children 85dea406e18f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 4376
diff changeset
3 # Copyright (C) Nginx, Inc.
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
4
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
6 if [ $USE_PERL = YES ]; then
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
7
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
8 cat << END >> $NGX_MAKEFILE
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
9
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
10 install_perl_modules:
4841
95ce3172493e Configure: fixed make macros to use parentheses instead of braces.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4740
diff changeset
11 cd $NGX_OBJS/src/http/modules/perl && \$(MAKE) install
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
12 END
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
13
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
14 NGX_INSTALL_PERL_MODULES=install_perl_modules
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
15
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
16 fi
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
17
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
18
2758
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
19 case ".$NGX_SBIN_PATH" in
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
20 ./*)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
21 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
22
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
23 *)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
24 NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
25 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
26 esac
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
27
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
28
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
29 case ".$NGX_CONF_PATH" in
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
30 ./*)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
31 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
32
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
33 *)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
34 NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
35 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
36 esac
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
37
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
38
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
39 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
40
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
41
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
42 case ".$NGX_PID_PATH" in
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
43 ./*)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
44 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
45
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
46 *)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
47 NGX_PID_PATH=$NGX_PREFIX/$NGX_PID_PATH
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
48 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
49 esac
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
50
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
51
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
52 case ".$NGX_ERROR_LOG_PATH" in
4199
874a2f505e2a Fixed configuration summary and manpage contents for the special
Ruslan Ermilov <ru@nginx.com>
parents: 4007
diff changeset
53 ./* | .)
2758
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
54 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
55
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
56 *)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
57 NGX_ERROR_LOG_PATH=$NGX_PREFIX/$NGX_ERROR_LOG_PATH
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
58 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
59 esac
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
60
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
61
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
62 case ".$NGX_HTTP_LOG_PATH" in
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
63 ./*)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
64 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
65
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
66 *)
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
67 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
68 ;;
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
69 esac
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
70
77264e0157ad -p and --prefix=
Igor Sysoev <igor@sysoev.ru>
parents: 2009
diff changeset
71
4376
9346356e433d configure on Solaris fixed
Sergey Budnevitch <sb@waeme.net>
parents: 4303
diff changeset
72 if test -f man/nginx.8 ; then
4303
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
73 NGX_MAN=man/nginx.8
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
74 else
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
75 NGX_MAN=docs/man/nginx.8
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
76 fi
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
77
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
78 if test -d html ; then
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
79 NGX_HTML=html
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
80 else
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
81 NGX_HTML=docs/html
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
82 fi
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
83
469
2ff194b74f1e nginx-0.1.9-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
84 cat << END >> $NGX_MAKEFILE
467
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
85
4007
7e3c557c2604 Rebuild manpage only if needed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 3801
diff changeset
86 manpage: $NGX_OBJS/nginx.8
7e3c557c2604 Rebuild manpage only if needed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 3801
diff changeset
87
4303
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
88 $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CONFIG_H
3788
b50daa26aa22 add nginx.8 man page
Igor Sysoev <igor@sysoev.ru>
parents: 3637
diff changeset
89 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
b50daa26aa22 add nginx.8 man page
Igor Sysoev <igor@sysoev.ru>
parents: 3637
diff changeset
90 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
b50daa26aa22 add nginx.8 man page
Igor Sysoev <igor@sysoev.ru>
parents: 3637
diff changeset
91 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
4199
874a2f505e2a Fixed configuration summary and manpage contents for the special
Ruslan Ermilov <ru@nginx.com>
parents: 4007
diff changeset
92 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
4303
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
93 < $NGX_MAN > \$@
3788
b50daa26aa22 add nginx.8 man page
Igor Sysoev <igor@sysoev.ru>
parents: 3637
diff changeset
94
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
95 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 495
diff changeset
96 $NGX_INSTALL_PERL_MODULES
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
97 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
98
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
99 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
100 || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
101 test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
102 || mv '\$(DESTDIR)$NGX_SBIN_PATH' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
103 '\$(DESTDIR)$NGX_SBIN_PATH.old'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
104 cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
105
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
106 test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
107 || mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
108
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
109 cp conf/koi-win '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
110 cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
111 cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
112
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
113 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
114 || cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
115 cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
116
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
117 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
118 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
119 cp conf/fastcgi_params \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
120 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
1352
e958b3cab51a --sysconfdir=DIR
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
121
3383
5aeaf8490578 add conf/fastcgi.conf
Igor Sysoev <igor@sysoev.ru>
parents: 3262
diff changeset
122 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
5aeaf8490578 add conf/fastcgi.conf
Igor Sysoev <igor@sysoev.ru>
parents: 3262
diff changeset
123 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
5aeaf8490578 add conf/fastcgi.conf
Igor Sysoev <igor@sysoev.ru>
parents: 3262
diff changeset
124 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
5aeaf8490578 add conf/fastcgi.conf
Igor Sysoev <igor@sysoev.ru>
parents: 3262
diff changeset
125
3609
0ae39a108291 install uwsgi_params
Igor Sysoev <igor@sysoev.ru>
parents: 3383
diff changeset
126 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \
0ae39a108291 install uwsgi_params
Igor Sysoev <igor@sysoev.ru>
parents: 3383
diff changeset
127 || cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
0ae39a108291 install uwsgi_params
Igor Sysoev <igor@sysoev.ru>
parents: 3383
diff changeset
128 cp conf/uwsgi_params \
0ae39a108291 install uwsgi_params
Igor Sysoev <igor@sysoev.ru>
parents: 3383
diff changeset
129 '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
0ae39a108291 install uwsgi_params
Igor Sysoev <igor@sysoev.ru>
parents: 3383
diff changeset
130
3637
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3609
diff changeset
131 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3609
diff changeset
132 || cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3609
diff changeset
133 cp conf/scgi_params \
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3609
diff changeset
134 '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3609
diff changeset
135
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
136 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
2982
fe23e95ba993 name of file specified in --conf-path was not honored during installation
Igor Sysoev <igor@sysoev.ru>
parents: 2850
diff changeset
137 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
138 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
139
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
140 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
141 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
142
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
143 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
144 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
145
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
146 test -d '\$(DESTDIR)$NGX_PREFIX/html' \
4303
b375a7f0d51a Made it possible to build/install from the SVN checkout.
Ruslan Ermilov <ru@nginx.com>
parents: 4199
diff changeset
147 || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
440
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
148 END
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
149
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
150
4199
874a2f505e2a Fixed configuration summary and manpage contents for the special
Ruslan Ermilov <ru@nginx.com>
parents: 4007
diff changeset
151 if test -n "$NGX_ERROR_LOG_PATH"; then
469
2ff194b74f1e nginx-0.1.9-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
152 cat << END >> $NGX_MAKEFILE
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
153
2009
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
154 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
df5ae577fab5 DESTDIR support
Igor Sysoev <igor@sysoev.ru>
parents: 1362
diff changeset
155 mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
156 END
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
157
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 440
diff changeset
158 fi
2850
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
159
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
160
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
161 # create Makefile
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
162
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
163 cat << END >> Makefile
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
164
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
165 build:
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
166 \$(MAKE) -f $NGX_MAKEFILE
3801
569716d0e447 add man page in release tarball and fix man building procedure
Igor Sysoev <igor@sysoev.ru>
parents: 3788
diff changeset
167 \$(MAKE) -f $NGX_MAKEFILE manpage
2850
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
168
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
169 install:
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
170 \$(MAKE) -f $NGX_MAKEFILE install
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
171
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
172 upgrade:
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
173 $NGX_SBIN_PATH -t
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
174
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
175 kill -USR2 \`cat $NGX_PID_PATH\`
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
176 sleep 1
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
177 test -f $NGX_PID_PATH.oldbin
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
178
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
179 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
4e05bd832e56 fix "make upgrade" broken in r2759
Igor Sysoev <igor@sysoev.ru>
parents: 2758
diff changeset
180 END