# HG changeset patch # User Igor Sysoev # Date 1252317795 0 # Node ID e326a69cabc9bd66d22c761159c4b8ca163bc29e # Parent 501fd3ae3188f605f33fd338aa90f78296885451 merge r2983: name of file specified in --conf-path was not honored during installation the bug had been appeared in r1353 diff --git a/auto/install b/auto/install --- a/auto/install +++ b/auto/install @@ -102,7 +102,7 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ng '\$(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"`' \