comparison auto/install @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 428c6e58046a
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
72 esac 72 esac
73 73
74 74
75 cat << END >> $NGX_MAKEFILE 75 cat << END >> $NGX_MAKEFILE
76 76
77 manpage:
78 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
79 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
80 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
81 -e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\
82 < man/nginx.8 > $NGX_OBJS/nginx.8
83
77 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 84 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
78 $NGX_INSTALL_PERL_MODULES 85 $NGX_INSTALL_PERL_MODULES
79 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 86 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
80 87
81 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \ 88 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
98 105
99 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \ 106 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' 107 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
101 cp conf/fastcgi_params \ 108 cp conf/fastcgi_params \
102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' 109 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
110
111 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
112 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
113 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
114
115 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \
116 || cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
117 cp conf/uwsgi_params \
118 '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
119
120 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \
121 || cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
122 cp conf/scgi_params \
123 '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
103 124
104 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ 125 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
105 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' 126 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
106 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' 127 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
107 128
130 151
131 cat << END >> Makefile 152 cat << END >> Makefile
132 153
133 build: 154 build:
134 \$(MAKE) -f $NGX_MAKEFILE 155 \$(MAKE) -f $NGX_MAKEFILE
156 \$(MAKE) -f $NGX_MAKEFILE manpage
135 157
136 install: 158 install:
137 \$(MAKE) -f $NGX_MAKEFILE install 159 \$(MAKE) -f $NGX_MAKEFILE install
138 160
139 upgrade: 161 upgrade:
142 kill -USR2 \`cat $NGX_PID_PATH\` 164 kill -USR2 \`cat $NGX_PID_PATH\`
143 sleep 1 165 sleep 1
144 test -f $NGX_PID_PATH.oldbin 166 test -f $NGX_PID_PATH.oldbin
145 167
146 kill -QUIT \`cat $NGX_PID_PATH.oldbin\` 168 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
147
148 upgrade1:
149 # upgrade 0.1.x to 0.2+
150
151 $NGX_SBIN_PATH -t
152
153 cp $NGX_PID_PATH $NGX_PID_PATH.oldbin
154
155 kill -USR2 \`cat $NGX_PID_PATH\`
156 sleep 1
157 test -f $NGX_PID_PATH.oldbin
158
159 cp $NGX_PID_PATH $NGX_PID_PATH.newbin
160
161 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
162 END 169 END