Mercurial > hg > nginx

comparison auto/make @ 6424:ae41f64f7c9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: style. Removed extraneous braces around shell variables.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 10 Mar 2016 10:43:00 +0300
parents 39a806ccf21e
children 05c894a598ea
comparison
equal deleted inserted replaced
6423:c5f81dcf97a7 6424:ae41f64f7c9b
223 223
224 cat << END >> $NGX_MAKEFILE 224 cat << END >> $NGX_MAKEFILE
225 225
226 build: binary modules manpage 226 build: binary modules manpage
227 227
228 binary: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} 228 binary: $NGX_OBJS${ngx_dirsep}nginx$ngx_binext
229 229
230 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer 230 $NGX_OBJS${ngx_dirsep}nginx$ngx_binext: $ngx_deps$ngx_spacer
231 \$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link 231 \$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
232 $ngx_rcc 232 $ngx_rcc
233 ${ngx_long_end} 233 $ngx_long_end
234 234
235 modules: 235 modules:
236 END 236 END
237 237
238 238
605 605
606 ngx_objs=`echo $ngx_module_objs $ngx_modules_obj \ 606 ngx_objs=`echo $ngx_module_objs $ngx_modules_obj \
607 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ 607 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
608 -e "s/\//$ngx_regex_dirsep/g"` 608 -e "s/\//$ngx_regex_dirsep/g"`
609 609
610 ngx_obj=$NGX_OBJS${ngx_dirsep}${ngx_module}${ngx_modext} 610 ngx_obj=$NGX_OBJS$ngx_dirsep$ngx_module$ngx_modext
611 611
612 NGX_MODULES="$NGX_MODULES $ngx_obj" 612 NGX_MODULES="$NGX_MODULES $ngx_obj"
613 613
614 if [ "$NGX_PLATFORM" = win32 ]; then 614 if [ "$NGX_PLATFORM" = win32 ]; then
615 ngx_module_libs="$CORE_LIBS $ngx_module_libs" 615 ngx_module_libs="$CORE_LIBS $ngx_module_libs"