merge r2983:

name of file specified in --conf-path was not honored during installation
the bug had been appeared in r1353
This commit is contained in:
Igor Sysoev 2009-09-07 10:03:15 +00:00
parent 4645fa7c02
commit 79d498074b
1 changed files with 1 additions and 1 deletions

View File

@ -102,7 +102,7 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
test -f '\$(DESTDIR)$NGX_CONF_PATH' \
|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \