Mercurial > hg > nginx
comparison auto/install @ 3095:e326a69cabc9 stable-0.7
merge r2983:
name of file specified in --conf-path was not honored during installation
the bug had been appeared in r1353
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Sep 2009 10:03:15 +0000 |
parents | 4e05bd832e56 |
children | 217703db5ae0 0189a8f4c7c3 |
comparison
equal
deleted
inserted
replaced
3094:501fd3ae3188 | 3095:e326a69cabc9 |
---|---|
100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' | 100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' |
101 cp conf/fastcgi_params \ | 101 cp conf/fastcgi_params \ |
102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' | 102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' |
103 | 103 |
104 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ | 104 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ |
105 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX' | 105 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' |
106 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' | 106 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' |
107 | 107 |
108 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \ | 108 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \ |
109 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' | 109 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' |
110 | 110 |