mirror of
https://github.com/nginx/nginx.git
synced 2026-08-03 22:33:10 +00:00
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.
This commit is contained in:
parent
7b232ef5aa
commit
4275d0a8a0
2 changed files with 5 additions and 4 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -223,6 +223,10 @@ ngx_main_link=${MAIN_LINK:+`echo $MAIN_LINK \
|
|||
|
||||
cat << END >> $NGX_MAKEFILE
|
||||
|
||||
build: binary modules manpage
|
||||
|
||||
binary: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}
|
||||
|
||||
$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer
|
||||
\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
|
||||
$ngx_rcc
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue