# HG changeset patch # User Maxim Dounin # Date 1344268035 0 # Node ID f033afb9d3f0ac15d73f4781417756ef88d7fb2b # Parent 179a4d4073b3885b79a05581581004067bd3b44a Merge of r4741: fixed "make" used instead of "${MAKE}". diff -r 179a4d4073b3 -r f033afb9d3f0 auto/install --- a/auto/install Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/install Mon Aug 06 15:47:15 2012 +0000 @@ -8,7 +8,7 @@ cat << END >> $NGX_MAKEFILE install_perl_modules: - cd $NGX_OBJS/src/http/modules/perl && make install + cd $NGX_OBJS/src/http/modules/perl && \${MAKE} install END NGX_INSTALL_PERL_MODULES=install_perl_modules diff -r 179a4d4073b3 -r f033afb9d3f0 auto/lib/libatomic/make --- a/auto/lib/libatomic/make Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/lib/libatomic/make Mon Aug 06 15:47:15 2012 +0000 @@ -6,7 +6,7 @@ cat << END >> $NGX_MAKEFILE $NGX_LIBATOMIC/src/libatomic_ops.a: $NGX_LIBATOMIC/Makefile - cd $NGX_LIBATOMIC && make + cd $NGX_LIBATOMIC && \${MAKE} $NGX_LIBATOMIC/Makefile: $NGX_MAKEFILE cd $NGX_LIBATOMIC && ./configure diff -r 179a4d4073b3 -r f033afb9d3f0 auto/lib/perl/make --- a/auto/lib/perl/make Mon Aug 06 15:45:44 2012 +0000 +++ b/auto/lib/perl/make Mon Aug 06 15:47:15 2012 +0000 @@ -12,7 +12,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/ - cd $NGX_OBJS/src/http/modules/perl && make + cd $NGX_OBJS/src/http/modules/perl && \${MAKE} rm -rf $NGX_OBJS/install_perl