mirror of
https://github.com/nginx/nginx.git
synced 2025-01-21 19:53:00 +08:00
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:
parent
a544b2ee98
commit
fbee171114
@ -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"`' \
|
||||
|
Loading…
Reference in New Issue
Block a user