Mercurial > hg > nginx

comparison auto/install @ 6408:cfc3cfa434ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 19 Feb 2016 18:13:54 +0300
parents 85dea406e18f
children 8e6f34342eb6
comparison
equal deleted inserted replaced
6407:062c189fee20 6408:cfc3cfa434ec
102 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\ 102 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
103 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\ 103 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
104 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\ 104 -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
105 < $NGX_MAN > \$@ 105 < $NGX_MAN > \$@
106 106
107 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 107 install: build $NGX_INSTALL_PERL_MODULES
108 $NGX_INSTALL_PERL_MODULES
109 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 108 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
110 109
111 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \ 110 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
112 || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' 111 || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
113 test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \ 112 test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \
185 184
186 cat << END >> Makefile 185 cat << END >> Makefile
187 186
188 build: 187 build:
189 \$(MAKE) -f $NGX_MAKEFILE 188 \$(MAKE) -f $NGX_MAKEFILE
190 \$(MAKE) -f $NGX_MAKEFILE modules
191 \$(MAKE) -f $NGX_MAKEFILE manpage
192 189
193 install: 190 install:
194 \$(MAKE) -f $NGX_MAKEFILE install 191 \$(MAKE) -f $NGX_MAKEFILE install
195 192
196 upgrade: 193 upgrade: