diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 10:03:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 10:03:15 +0000 |
| commit | fbee1711143dc781c790388ebe177066f2d60484 (patch) | |
| tree | 3c0167317c0a27dc5788e67e64f98e2f93fe5435 | |
| parent | a544b2ee9858675c05d98330310b4f571ab21c66 (diff) | |
| download | nginx-fbee1711143dc781c790388ebe177066f2d60484.tar.gz nginx-fbee1711143dc781c790388ebe177066f2d60484.tar.bz2 | |
merge r2983:
name of file specified in --conf-path was not honored during installation
the bug had been appeared in r1353
| -rw-r--r-- | auto/install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/auto/install b/auto/install index c17dac612..f876891f8 100644 --- a/auto/install +++ b/auto/install @@ -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"`' \ |