summaryrefslogtreecommitdiffhomepage
path: root/auto/install
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2016-02-19 18:13:54 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2016-02-19 18:13:54 +0300
commit4275d0a8a00090b31d34ace8ddc95412cc6c700a (patch)
treeec5b9a8dc9b77723249e976750f3d29685688eba /auto/install
parent7b232ef5aa31e228da64ae6dce3873ccedbfb2c0 (diff)
downloadnginx-4275d0a8a00090b31d34ace8ddc95412cc6c700a.tar.gz
nginx-4275d0a8a00090b31d34ace8ddc95412cc6c700a.tar.bz2
Configure: added "build" target.
The "build" target introduced to do all build-related tasks, and it is now used in Makefile and in objs/Makefile as a dependency for the "install" target. In particular, this resolves problems as observed with dynamic modules by people trying to do "make install" without calling "make" first.
Diffstat (limited to 'auto/install')
-rw-r--r--auto/install5
1 files changed, 1 insertions, 4 deletions
diff --git a/auto/install b/auto/install
index 4dcc743d3..9469a49ab 100644
--- a/auto/install
+++ b/auto/install
@@ -104,8 +104,7 @@ $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CONFIG_H
-e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
< $NGX_MAN > \$@
-install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
- $NGX_INSTALL_PERL_MODULES
+install: build $NGX_INSTALL_PERL_MODULES
test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
@@ -187,8 +186,6 @@ cat << END >> Makefile
build:
\$(MAKE) -f $NGX_MAKEFILE
- \$(MAKE) -f $NGX_MAKEFILE modules
- \$(MAKE) -f $NGX_MAKEFILE manpage
install:
\$(MAKE) -f $NGX_MAKEFILE install